From 7dfad83f85857f917b6333aea3ffbb0964c54b0a Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov@tarantool.org>
Date: Wed, 11 Aug 2021 17:07:14 +0300
Subject: [PATCH] test: fix box-py/args.test.py for new release policy
The test assumes that a version string looks like this
2.9.0-123-gabcabcababc. We want to append a flow string
after <major>.<minor>.<patch>. Fix the test accordingly.
Needed for #6183
---
test/box-py/args.result | 8 ++++----
test/box-py/args.test.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/box-py/args.result b/test/box-py/args.result
index 54629edea5..1ae941e736 100644
--- a/test/box-py/args.result
+++ b/test/box-py/args.result
@@ -44,7 +44,7 @@ tarantool --no-such-option --version
tarantool: unrecognized option
tarantool --version
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 2.minor.patch-<suffix>-<rev>-<commit>
Target: platform <build>
Build options: flags
Compiler: cc
@@ -52,7 +52,7 @@ C_FLAGS: flags
CXX_FLAGS: flags
tarantool -v
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 2.minor.patch-<suffix>-<rev>-<commit>
Target: platform <build>
Build options: flags
Compiler: cc
@@ -60,7 +60,7 @@ C_FLAGS: flags
CXX_FLAGS: flags
tarantool -V
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 2.minor.patch-<suffix>-<rev>-<commit>
Target: platform <build>
Build options: flags
Compiler: cc
@@ -111,7 +111,7 @@ arg[3] => 2
arg[4] => 3
tarantool -V ${SOURCEDIR}/test/box-py/args.lua 1 2 3
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 2.minor.patch-<suffix>-<rev>-<commit>
Target: platform <build>
Build options: flags
Compiler: cc
diff --git a/test/box-py/args.test.py b/test/box-py/args.test.py
index f368da880b..b412564995 100644
--- a/test/box-py/args.test.py
+++ b/test/box-py/args.test.py
@@ -22,7 +22,7 @@ sys.stdout.push_filter("unrecognized option.*", "unrecognized option")
server.test_option("-Z")
server.test_option("--no-such-option")
server.test_option("--no-such-option --version")
-sys.stdout.push_filter(".* (\d+)\.\d+\.\d+(-\d+-\w+)?", "Tarantool \\1.minor.patch-<rev>-<commit>")
+sys.stdout.push_filter(".* (\d+)\.\d+\.\d+(-\w+)?(-\d+)?(-\w+)?", "Tarantool \\1.minor.patch-<suffix>-<rev>-<commit>")
sys.stdout.push_filter("Target: .*", "Target: platform <build>")
sys.stdout.push_filter(".*Disable shared arena since.*\n", "")
sys.stdout.push_filter("Build options: .*", "Build options: flags")
--
GitLab