Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Kirill Yukhin <kyukhin@tarantool.org>,
	Serge Petrenko <sergepetrenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v1] test: fix replication/replica_rejoin.test.lua
Date: Tue, 13 Oct 2020 15:54:49 +0300	[thread overview]
Message-ID: <af37be923849e1d8e60c9b84e91b20aecb5bf94a.1602593625.git.avtikhon@tarantool.org> (raw)

Mistakenly the patch from 2.x Tarantool releases was used for 1.10:

  61e5229617d4a840b9ae8bd2454dcef8fc1c754b "test: flaky replication/replica_rejoin.test.lua"

While the test had to be adapted especialy for 1.10. This commit
fixes the issue produced by that patch and completely adapts the
needed changes. The difference between 1.10 release and 2.x is
the different replication status need to be checked:

  2.x: "loading" + message
  1.10: "stopped" + box.info.status == "orphan"
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/flaky-checksums_1.10_fix

 test/replication/replica_rejoin.result   | 6 +++++-
 test/replication/replica_rejoin.test.lua | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/replication/replica_rejoin.result b/test/replication/replica_rejoin.result
index f6e41edc3..18a698d28 100644
--- a/test/replication/replica_rejoin.result
+++ b/test/replication/replica_rejoin.result
@@ -224,7 +224,11 @@ test_run:cmd("switch replica")
 ---
 - true
 ...
-test_run:wait_upstream(1, {message_re = 'Missing %.xlog file', status = 'loading'})
+test_run:wait_upstream(1, {status = 'stopped'})
+---
+- true
+...
+test_run:wait_cond(function() return box.info.status == 'orphan' end)
 ---
 - true
 ...
diff --git a/test/replication/replica_rejoin.test.lua b/test/replication/replica_rejoin.test.lua
index 0aeaba6c0..f2c2f0b44 100644
--- a/test/replication/replica_rejoin.test.lua
+++ b/test/replication/replica_rejoin.test.lua
@@ -82,7 +82,8 @@ test_run:wait_cond(function() return #fio.glob(fio.pathjoin(box.cfg.wal_dir, '*.
 box.cfg{checkpoint_count = checkpoint_count}
 test_run:cmd("start server replica with args='true'")
 test_run:cmd("switch replica")
-test_run:wait_upstream(1, {message_re = 'Missing %.xlog file', status = 'loading'})
+test_run:wait_upstream(1, {status = 'stopped'})
+test_run:wait_cond(function() return box.info.status == 'orphan' end)
 box.space.test:select()
 
 --
-- 
2.25.1

             reply	other threads:[~2020-10-13 12:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-13 12:54 Alexander V. Tikhonov [this message]
2020-10-13 13:28 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=af37be923849e1d8e60c9b84e91b20aecb5bf94a.1602593625.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=sergepetrenko@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1] test: fix replication/replica_rejoin.test.lua' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox