[Tarantool-patches] [PATCH 1/1] test: fix flaky replication/gh-* tests

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Tue Nov 26 01:43:36 MSK 2019


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)



More information about the Tarantool-patches mailing list