From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 7C598257CF for ; Tue, 30 Jul 2019 15:32:28 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZwSm4p5kdcZM for ; Tue, 30 Jul 2019 15:32:28 -0400 (EDT) Received: from smtp37.i.mail.ru (smtp37.i.mail.ru [94.100.177.97]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id CD86025799 for ; Tue, 30 Jul 2019 15:32:27 -0400 (EDT) From: Vladislav Shpilevoy Subject: [tarantool-patches] [PATCH 1/1] test: fix flaky swim/errinj.test.lua Date: Tue, 30 Jul 2019 21:34:35 +0200 Message-Id: <370fd137fece7c2ec40108893a63dec35aaf9b85.1564515238.git.v.shpilevoy@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: alexander.turenko@tarantool.org In one place that test sends a packet and expects that it has arrived two lines below. Under high load it may take more time. The patch makes the test explicitly wait for the packet arrival. Closes #4392 --- Issue: https://github.com/tarantool/tarantool/issues/4392 Branch: https://github.com/tarantool/tarantool/tree/gerold103/gh-4392-swim-flaky-test test/swim/errinj.result | 3 +++ test/swim/errinj.test.lua | 1 + 2 files changed, 4 insertions(+) diff --git a/test/swim/errinj.result b/test/swim/errinj.result index efeab87a8..cf26b0a4a 100644 --- a/test/swim/errinj.result +++ b/test/swim/errinj.result @@ -60,6 +60,9 @@ errinj.set("ERRINJ_SWIM_FD_ONLY", false) --- - ok ... +while s1_view:incarnation().version ~= 2 do fiber.sleep(0.01) end +--- +... s1_view:payload() --- - null diff --git a/test/swim/errinj.test.lua b/test/swim/errinj.test.lua index cf0cb2dd4..6c73f9f3d 100644 --- a/test/swim/errinj.test.lua +++ b/test/swim/errinj.test.lua @@ -26,6 +26,7 @@ s1:self():incarnation() errinj.set("ERRINJ_SWIM_FD_ONLY", true) s1:probe_member(s2:self():uri()) errinj.set("ERRINJ_SWIM_FD_ONLY", false) +while s1_view:incarnation().version ~= 2 do fiber.sleep(0.01) end s1_view:payload() s1_view:incarnation() -- 2.20.1 (Apple Git-117)