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 10B8F44643C for ; Fri, 30 Oct 2020 10:00:08 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Fri, 30 Oct 2020 10:00:01 +0300 Message-Id: <1b54aef8c8517ac18a6ecbbacb635684d6e873d5.1604040010.git.avtikhon@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v1 3/4] test: fix flaky vinyl/gh-4957-too-many-upserts 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 restart the current server to resolve the issue #5141 which reproduced in test: vinyl/gh-5141-invalid-vylog-file.test.lua 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. Part of #5141 --- test/vinyl/gh-4957-too-many-upserts.result | 17 +++++++++++++++++ test/vinyl/gh-4957-too-many-upserts.test.lua | 11 +++++++++++ 2 files changed, 28 insertions(+) diff --git a/test/vinyl/gh-4957-too-many-upserts.result b/test/vinyl/gh-4957-too-many-upserts.result index 67292f0f8..c942e62c8 100644 --- a/test/vinyl/gh-4957-too-many-upserts.result +++ b/test/vinyl/gh-4957-too-many-upserts.result @@ -1,4 +1,13 @@ -- test-run result file version 2 +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 + | ... + s = box.schema.create_space('test', {engine = 'vinyl'}) | --- | ... @@ -90,3 +99,11 @@ fiber.sleep(0.01) s:drop() | --- | ... + +-- restart the current server to resolve the issue #5141 +-- which reproduced in test: +-- vinyl/gh-5141-invalid-vylog-file.test.lua +test_run:cmd("restart server default with cleanup=True") + | + + diff --git a/test/vinyl/gh-4957-too-many-upserts.test.lua b/test/vinyl/gh-4957-too-many-upserts.test.lua index e5adfe41c..572540a4c 100644 --- a/test/vinyl/gh-4957-too-many-upserts.test.lua +++ b/test/vinyl/gh-4957-too-many-upserts.test.lua @@ -1,3 +1,7 @@ +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'") + s = box.schema.create_space('test', {engine = 'vinyl'}) pk = s:create_index('pk') s:insert{1, 1} @@ -36,3 +40,10 @@ box.snapshot() fiber.sleep(0.01) s:drop() + +-- restart the current server to resolve the issue #5141 +-- which reproduced in test: +-- vinyl/gh-5141-invalid-vylog-file.test.lua +test_run:cmd("restart server default with cleanup=True") + + -- 2.25.1