From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) (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 3A301469719 for ; Fri, 30 Oct 2020 10:00:06 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Fri, 30 Oct 2020 09:59:59 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v1 1/4] test: add test filter for box.snapshot List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kirill Yukhin Cc: tarantool-patches@dev.tarantool.org Added test-run filter on box.snapshot error message: 'Invalid VYLOG file: Slice [0-9]+ deleted but not registered' to avoid of printing changing data in results file to be able to use its checksums in fragile list of test-run to rerun it as flaky issue. Also added checksums to fragile list for the following tests: vinyl/iterator.test.lua gh-5141 vinyl/snapshot.test.lua gh-4984 Needed for #5141 Needed for #4984 --- test/vinyl/iterator.result | 5 +++++ test/vinyl/iterator.test.lua | 3 +++ test/vinyl/snapshot.result | 5 +++++ test/vinyl/snapshot.test.lua | 3 +++ test/vinyl/suite.ini | 4 ++-- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/test/vinyl/iterator.result b/test/vinyl/iterator.result index 0ef2a1b46..7992a386a 100644 --- a/test/vinyl/iterator.result +++ b/test/vinyl/iterator.result @@ -20,6 +20,11 @@ iterator_next = function(iter) return iter.next() end iterate_over = function(iter) return iter.iterate_over() end --- ... +test_run:cmd("push filter 'Invalid VYLOG file: Slice [0-9]+ deleted but not registered'" .. \ + "to 'Invalid VYLOG file: Slice deleted but not registered'") +--- +- true +... -- -- Following tests verify that combinations -- of various commands are worked correctly. diff --git a/test/vinyl/iterator.test.lua b/test/vinyl/iterator.test.lua index 8d2a85930..b5aeeda1e 100644 --- a/test/vinyl/iterator.test.lua +++ b/test/vinyl/iterator.test.lua @@ -12,6 +12,9 @@ create_iterator = require('utils').create_iterator iterator_next = function(iter) return iter.next() end iterate_over = function(iter) return iter.iterate_over() end +test_run:cmd("push filter 'Invalid VYLOG file: Slice [0-9]+ deleted but not registered'" .. \ + "to 'Invalid VYLOG file: Slice deleted but not registered'") + -- -- Following tests verify that combinations -- of various commands are worked correctly. diff --git a/test/vinyl/snapshot.result b/test/vinyl/snapshot.result index 1c723ed74..2297fbbee 100644 --- a/test/vinyl/snapshot.result +++ b/test/vinyl/snapshot.result @@ -1,6 +1,11 @@ test_run = require('test_run').new() --- ... +test_run:cmd("push filter 'Invalid VYLOG file: Slice [0-9]+ deleted but not registered'" .. \ + "to 'Invalid VYLOG file: Slice deleted but not registered'") +--- +- true +... fiber = require 'fiber' --- ... diff --git a/test/vinyl/snapshot.test.lua b/test/vinyl/snapshot.test.lua index 0667dcae0..f698c1734 100644 --- a/test/vinyl/snapshot.test.lua +++ b/test/vinyl/snapshot.test.lua @@ -1,5 +1,8 @@ test_run = require('test_run').new() +test_run:cmd("push filter 'Invalid VYLOG file: Slice [0-9]+ deleted but not registered'" .. \ + "to 'Invalid VYLOG file: Slice deleted but not registered'") + fiber = require 'fiber' fio = require 'fio' xlog = require 'xlog' diff --git a/test/vinyl/suite.ini b/test/vinyl/suite.ini index 870f25ddd..3ba29f0c6 100644 --- a/test/vinyl/suite.ini +++ b/test/vinyl/suite.ini @@ -37,7 +37,7 @@ fragile = { }, "snapshot.test.lua": { "issues": [ "gh-4984" ], - "checksums": [ "10783b2ecef8db6735719304f3d72b88" ] + "checksums": [ "a221e2583ccef2ec884b945bbbba106e", "2caa0a1c7f07b57a1ad784688b8dff40" ] }, "write_iterator.test.lua": { "issues": [ "gh-4572" ] @@ -57,7 +57,7 @@ fragile = { }, "iterator.test.lua": { "issues": [ "gh-5336" ], - "checksums": [ "138808fd31b68d1b1c53c6a146124856" ] + "checksums": [ "f56d6d279692e46d84a06f470af0090d", "a8a2824fb09380330a70a589d4fc545e", "e03548bcb918e824c349dc4c52ae3715", "adbd4ad9878302d570e40aef9a6b92cc", "39ee43ee7b2004166ca54402dfe02238" ] }, "ddl.test.lua": { "issues": [ "gh-5338" ], -- 2.25.1