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 A36F7225A2 for ; Tue, 16 Apr 2019 04:01:44 -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 6gjhtAdAr80g for ; Tue, 16 Apr 2019 04:01:44 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 5AA1F1FE89 for ; Tue, 16 Apr 2019 04:01:44 -0400 (EDT) From: avtikhon Subject: [tarantool-patches] [PATCH v1] test: sync.test.lua needs to use default timeout Date: Tue, 16 Apr 2019 11:01:40 +0300 Message-Id: <7928dfb70e6d7fe985b6433a5fab479a6f59dce2.1555401510.git.avtikhon@tarantool.org> 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: Alexander Turenko Cc: avtikhon , tarantool-patches@freelists.org sync.test.lua changed to use default 60 secs timeout for wait_cond routine instead of local 10 secs. [014] --- replication/sync.result Fri Apr 12 14:49:26 2019 [014] +++ replication/sync.reject Tue Apr 16 10:24:29 2019 [014] @@ -166,7 +166,7 @@ [014] -- Wait for remaining rows to arrive. [014] test_run:wait_cond(function() return box.space.test:count() == 400 end, 10) [014] --- [014] -- true [014] +- false [014] ... [014] -- Stop replication. [014] replication = box.cfg.replication [014] @@ -214,7 +214,7 @@ [014] -- Wait for remaining rows to arrive. [014] test_run:wait_cond(function() return box.space.test:count() == 600 end, 10) [014] --- [014] -- true [014] +- false [014] ... [014] -- Make sure replica leaves oprhan state. [014] test_run:wait_cond(function() return box.info.status ~= 'orphan' end, 10) [014] Close #4163 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4163-sync-default-timeout Issue: https://github.com/tarantool/tarantool/issues/4163 test/replication/sync.result | 6 +++--- test/replication/sync.test.lua | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/replication/sync.result b/test/replication/sync.result index eddc7cbc8..975fe0a6c 100644 --- a/test/replication/sync.result +++ b/test/replication/sync.result @@ -164,7 +164,7 @@ box.info.ro -- false - false ... -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 400 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 400 end) --- - true ... @@ -212,12 +212,12 @@ box.info.ro -- true - true ... -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 600 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 600 end) --- - true ... -- Make sure replica leaves oprhan state. -test_run:wait_cond(function() return box.info.status ~= 'orphan' end, 10) +test_run:wait_cond(function() return box.info.status ~= 'orphan' end) --- - true ... diff --git a/test/replication/sync.test.lua b/test/replication/sync.test.lua index 52ce88fe2..ac8ca2470 100644 --- a/test/replication/sync.test.lua +++ b/test/replication/sync.test.lua @@ -92,7 +92,7 @@ box.info.status -- running box.info.ro -- false -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 400 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 400 end) -- Stop replication. replication = box.cfg.replication @@ -116,10 +116,10 @@ box.info.status -- orphan box.info.ro -- true -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 600 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 600 end) -- Make sure replica leaves oprhan state. -test_run:wait_cond(function() return box.info.status ~= 'orphan' end, 10) +test_run:wait_cond(function() return box.info.status ~= 'orphan' end) box.info.status -- running box.info.ro -- false -- 2.17.1