From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id BC4A46EC40; Wed, 11 Aug 2021 18:49:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BC4A46EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628696963; bh=I/LU/RJC0top06CPJbKvPPmjY+dMaOwVIB6JyDXZ53g=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Yo3aeU94iM+/UmzhCjiumuCSBi84n2jTNdbixxK0gLnimOpBnOdAtbtWHdvflCbJT HY2ngD1x4W+AYKHUIPecXqUtpPAsLy3Dtm+xrBZDq2htv1CyPjNPTcK7JW12fjasr0 sfl46Qh2c1kCZXu1IoZbvXcC1Jwbl0xXEyuICo2k= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D13A56EC40 for ; Wed, 11 Aug 2021 18:49:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D13A56EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mDqTo-0007br-Sq; Wed, 11 Aug 2021 18:49:21 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 11 Aug 2021 18:49:20 +0300 Message-Id: <872cac573757fd3caa544aeec6d05b51762f215e.1628691477.git.vdavydov@tarantool.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD910164DC12A5633065676A9727AC27C74182A05F538085040C203ECC677DB5E76DDFE03F15B751CA99970C8064069D6C9F81C3F3AE62CCC15 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE782A779A89F7D69B2C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE75C385DEB91CEC222EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F2526A6C276A0474648E013EBEBB5D51F3CC7F00164DA146DAFE8445B8C89999728AA50765F790063783E00425F71A4181389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC81D471462564A2E19F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8BDCE939D40DBB93CA75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C6B668463F4F89F863B8EDF86D73E9DC742984206C4D4E2689C2B6934AE262D3EE7EAB7254005DCEDC622B31043BEC9E01E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0AEA200A0D3D80EA68E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346F44602F3B494634BBEE64DB42FE016C82BAE151A79A908CD589DA727B237546573212FD28D74C861D7E09C32AA3244C6BE9CBA7BB969FE5D69193B5EC653770435BF7150578642FFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj6qlzQV0oSZMgQOarGIXW5A== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DCA485EE15551A906050D487699DBFC7E274CEFED1673C562683ABF942079399BFB559BB5D741EB966A65DFF43FF7BE03240331F90058701C67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH] test: fix box-py/args.test.py for new release policy X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Vladimir Davydov via Tarantool-patches Reply-To: Vladimir Davydov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "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 ... 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--") +sys.stdout.push_filter(".* (\d+)\.\d+\.\d+(-\w+)?(-\d+)?(-\w+)?", "Tarantool \\1.minor.patch--") sys.stdout.push_filter("Target: .*", "Target: platform ") sys.stdout.push_filter(".*Disable shared arena since.*\n", "") sys.stdout.push_filter("Build options: .*", "Build options: flags") -- 2.25.1