Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: tarantool-patches@dev.tarantool.org, alexander.turenko@tarantool.org
Subject: [Tarantool-patches] [PATCH 1/1] test: fix flaky replication/gh-* tests
Date: Mon, 25 Nov 2019 23:43:36 +0100	[thread overview]
Message-ID: <d94acc61e0dd96b3365281635c94dc85d19ff31e.1574721619.git.v.shpilevoy@tarantool.org> (raw)

The tests didn't cleanup _cluster table. Autocleanup is turned on
only in > 1.10 versions. In 1.10 these tests failed, when were
launched in one test-run worker, because they still remembered
previous already deleted instances.

The patch makes cleanup in the end of these tests. Autocleanup
still works on master, but for the sake of similarity the manual
cleanup is done for all branches, including > 1.10.

Closes #4645
---
Branch: https://github.com/tarantool/tarantool/tree/gerold103/gh-4645-flaky-replication-test
Issue: https://github.com/tarantool/tarantool/issues/4645

 test/replication/gh-4402-info-errno.result       | 4 ++++
 test/replication/gh-4402-info-errno.test.lua     | 2 ++
 test/replication/gh-4605-empty-password.result   | 4 ++++
 test/replication/gh-4605-empty-password.test.lua | 2 ++
 test/replication/gh-4606-admin-creds.result      | 4 ++++
 test/replication/gh-4606-admin-creds.test.lua    | 2 ++
 6 files changed, 18 insertions(+)

diff --git a/test/replication/gh-4402-info-errno.result b/test/replication/gh-4402-info-errno.result
index 661eea38b..25829634e 100644
--- a/test/replication/gh-4402-info-errno.result
+++ b/test/replication/gh-4402-info-errno.result
@@ -61,3 +61,7 @@ d ~= nil and d.system_message ~= nil and d.message ~= nil or i
 box.schema.user.revoke('guest', 'replication')
  | ---
  | ...
+
+test_run:cleanup_cluster()
+ | ---
+ | ...
diff --git a/test/replication/gh-4402-info-errno.test.lua b/test/replication/gh-4402-info-errno.test.lua
index 1b2d9d814..27348d5fd 100644
--- a/test/replication/gh-4402-info-errno.test.lua
+++ b/test/replication/gh-4402-info-errno.test.lua
@@ -23,3 +23,5 @@ d = i.replication[replica_id].downstream
 d ~= nil and d.system_message ~= nil and d.message ~= nil or i
 
 box.schema.user.revoke('guest', 'replication')
+
+test_run:cleanup_cluster()
diff --git a/test/replication/gh-4605-empty-password.result b/test/replication/gh-4605-empty-password.result
index defdfcfcd..bb4000d41 100644
--- a/test/replication/gh-4605-empty-password.result
+++ b/test/replication/gh-4605-empty-password.result
@@ -60,3 +60,7 @@ test_run:cmd("delete server replica_auth")
 box.schema.user.drop('test_user')
  | ---
  | ...
+
+test_run:cleanup_cluster()
+ | ---
+ | ...
diff --git a/test/replication/gh-4605-empty-password.test.lua b/test/replication/gh-4605-empty-password.test.lua
index f42a55f81..c06e052b0 100644
--- a/test/replication/gh-4605-empty-password.test.lua
+++ b/test/replication/gh-4605-empty-password.test.lua
@@ -25,3 +25,5 @@ test_run:cmd("cleanup server replica_auth")
 test_run:cmd("delete server replica_auth")
 
 box.schema.user.drop('test_user')
+
+test_run:cleanup_cluster()
diff --git a/test/replication/gh-4606-admin-creds.result b/test/replication/gh-4606-admin-creds.result
index fc0fbff44..4b46890ac 100644
--- a/test/replication/gh-4606-admin-creds.result
+++ b/test/replication/gh-4606-admin-creds.result
@@ -61,3 +61,7 @@ box.schema.user.passwd('admin', '')
 box.schema.user.revoke('admin', 'replication')
  | ---
  | ...
+
+test_run:cleanup_cluster()
+ | ---
+ | ...
diff --git a/test/replication/gh-4606-admin-creds.test.lua b/test/replication/gh-4606-admin-creds.test.lua
index 217d46ce1..6894429de 100644
--- a/test/replication/gh-4606-admin-creds.test.lua
+++ b/test/replication/gh-4606-admin-creds.test.lua
@@ -24,3 +24,5 @@ test_run:cmd("delete server replica_auth")
 
 box.schema.user.passwd('admin', '')
 box.schema.user.revoke('admin', 'replication')
+
+test_run:cleanup_cluster()
-- 
2.21.0 (Apple Git-122.2)

             reply	other threads:[~2019-11-25 22:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-25 22:43 Vladislav Shpilevoy [this message]
2019-11-26 23:49 ` Alexander Turenko
2019-11-27 22:30   ` Vladislav Shpilevoy

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=d94acc61e0dd96b3365281635c94dc85d19ff31e.1574721619.git.v.shpilevoy@tarantool.org \
    --to=v.shpilevoy@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 1/1] test: fix flaky replication/gh-* tests' \
    /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