Tarantool development patches archive
 help / color / mirror / Atom feed
* [Tarantool-patches] [PATCH] test: fix box-py/args.test.py for new release policy
@ 2021-08-11 15:49 Vladimir Davydov via Tarantool-patches
  2021-08-17  9:45 ` Kirill Yukhin via Tarantool-patches
  0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Davydov via Tarantool-patches @ 2021-08-11 15:49 UTC (permalink / raw)
  To: kyukhin; +Cc: tarantool-patches

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
---
https://github.com/tarantool/tarantool/issues/6183
https://github.com/tarantool/tarantool/tree/vdavydov/fix-test-for-new-release-policy

 test/box-py/args.test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/box-py/args.test.py b/test/box-py/args.test.py
index f368da880bdb..012a81a07348 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-<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")
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Tarantool-patches] [PATCH] test: fix box-py/args.test.py for new release policy
  2021-08-11 15:49 [Tarantool-patches] [PATCH] test: fix box-py/args.test.py for new release policy Vladimir Davydov via Tarantool-patches
@ 2021-08-17  9:45 ` Kirill Yukhin via Tarantool-patches
  2021-08-17 10:56   ` Vladimir Davydov via Tarantool-patches
  0 siblings, 1 reply; 3+ messages in thread
From: Kirill Yukhin via Tarantool-patches @ 2021-08-17  9:45 UTC (permalink / raw)
  To: Vladimir Davydov; +Cc: tarantool-patches

Hello,

On 11 авг 18:49, Vladimir Davydov wrote:
> 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
> ---
> https://github.com/tarantool/tarantool/issues/6183
> https://github.com/tarantool/tarantool/tree/vdavydov/fix-test-for-new-release-policy

LGTM.

--
Regards, Kirill Yukhin

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Tarantool-patches] [PATCH] test: fix box-py/args.test.py for new release policy
  2021-08-17  9:45 ` Kirill Yukhin via Tarantool-patches
@ 2021-08-17 10:56   ` Vladimir Davydov via Tarantool-patches
  0 siblings, 0 replies; 3+ messages in thread
From: Vladimir Davydov via Tarantool-patches @ 2021-08-17 10:56 UTC (permalink / raw)
  To: Kirill Yukhin; +Cc: tarantool-patches

Pushed to master, 2.8, 2.7, 1.10.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-08-17 10:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-11 15:49 [Tarantool-patches] [PATCH] test: fix box-py/args.test.py for new release policy Vladimir Davydov via Tarantool-patches
2021-08-17  9:45 ` Kirill Yukhin via Tarantool-patches
2021-08-17 10:56   ` Vladimir Davydov via Tarantool-patches

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox