From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43])
 (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 D8A3D430409
 for <tarantool-patches@dev.tarantool.org>;
 Thu,  3 Sep 2020 17:10:06 +0300 (MSK)
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Thu,  3 Sep 2020 17:10:04 +0300
Message-Id: <c9c6d67cd18cdabcd6a46d20f80afe7992869c89.1599142125.git.avtikhon@tarantool.org>
Subject: [Tarantool-patches] [PATCH v1] test: fix status at
	replication/misc*4424* test
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Kirill Yukhin <kyukhin@tarantool.org>, Serge Petrenko <sergepetrenko@tarantool.org>
Cc: Mergen Imeev <imeevma@gmail.com>, tarantool-patches@dev.tarantool.org

Fixed flaky status check:

  [016] @@ -73,11 +73,11 @@
  [016]  ...
  [016]  box.info.status
  [016]  ---
  [016] -- running
  [016] +- orphan
  [016]  ...
  [016]  box.info.ro
  [016]  ---
  [016] -- false
  [016] +- true
  [016]  ...
  [016]  box.cfg{                                                        \
  [016]      replication = {},                                           \
  [016]

Test changed to use wait condition for the status check, which should
be changed from 'orphan' to 'running'. On heavy loaded hosts it may
spend some additional time, wait condition routine helped to fix it.

Closes #5271
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4940-replication-misc
Issue: https://github.com/tarantool/tarantool/issues/5271

 .../misc_orphan_on_reconfiguration_error_gh-4424.result   | 8 ++------
 .../misc_orphan_on_reconfiguration_error_gh-4424.test.lua | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.result b/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.result
index c87ef2e05..110a0232d 100644
--- a/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.result
+++ b/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.result
@@ -65,13 +65,9 @@ box.info.ro
 box.cfg{replication_connect_quorum=1}
 ---
 ...
-box.info.status
+test_run:wait_cond(function() return box.info.status == 'running' and box.info.ro == false end)
 ---
-- running
-...
-box.info.ro
----
-- false
+- true
 ...
 box.cfg{                                                        \
     replication = {},                                           \
diff --git a/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.test.lua b/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.test.lua
index 6f42863c3..e35515aa5 100644
--- a/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.test.lua
+++ b/test/replication/misc_orphan_on_reconfiguration_error_gh-4424.test.lua
@@ -25,8 +25,7 @@ box.info.status
 box.info.ro
 -- lower quorum => leave orphan mode
 box.cfg{replication_connect_quorum=1}
-box.info.status
-box.info.ro
+test_run:wait_cond(function() return box.info.status == 'running' and box.info.ro == false end)
 
 box.cfg{                                                        \
     replication = {},                                           \
-- 
2.17.1