gh-1656, gh-801 test case: review fixes

Rename tests, reduce sleep interval, cleanup after the test a bit more thoroughly, disable the test in release mode.
tarantool · Sep 23, 2016 · 8778b83 · 8778b83
1 parent 4d34cd1
commit 8778b83
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/test/replication/catch.result b/test/replication/catch.result
@@ -133,3 +133,6 @@ box.space.test:drop()
 box.schema.user.revoke('guest', 'replication')
 ---
 ...
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
+---
+...
diff --git a/test/replication/catch.test.lua b/test/replication/catch.test.lua
@@ -59,4 +59,5 @@ test_run:cmd("stop server replica")
 test_run:cmd("cleanup server replica")
 box.space.test:drop()
 box.schema.user.revoke('guest', 'replication')
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
 
diff --git a/test/replication/wal_fail.result → test/replication/errinj.result b/test/replication/wal_fail.result → test/replication/errinj.result
@@ -46,7 +46,7 @@ function wait_repl(cnt)
         if s.index[0]:len() >= cnt then
             return true
         end
-        fiber.sleep(0.05)
+        fiber.sleep(0.01)
     end
     return false
 end;
@@ -155,3 +155,9 @@ box.space.test.index[0]:len()
 ---
 - 50
 ...
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
+---
+...
+box.schema.user.revoke('guest', 'replication')
+---
+...
diff --git a/test/replication/wal_fail.test.lua → test/replication/errinj.test.lua b/test/replication/wal_fail.test.lua → test/replication/errinj.test.lua
@@ -21,7 +21,7 @@ function wait_repl(cnt)
         if s.index[0]:len() >= cnt then
             return true
         end
-        fiber.sleep(0.05)
+        fiber.sleep(0.01)
     end
     return false
 end;
@@ -74,3 +74,5 @@ wait_repl(50)
 test_run:cmd("switch default")
 box.space.test.index[0]:len()
 
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
+box.schema.user.revoke('guest', 'replication')
diff --git a/test/replication/suite.ini b/test/replication/suite.ini
@@ -3,6 +3,6 @@ core = tarantool
 script =  master.lua
 description = tarantool/box, replication
 disabled = consistent.test.lua
-release_disabled = catch.test.lua
+release_disabled = catch.test.lua errinj.test.lua
 lua_libs = lua/fast_replica.lua
 long_run = prune.test.lua