Tarantool development patches archive
 help / color / mirror / Atom feed
* [tarantool-patches] [PATCH] test: enable parallel mode for wall_off tests
@ 2018-09-13 16:30 Sergei Voronezhskii
  2018-09-15  1:13 ` [tarantool-patches] " Alexander Turenko
  0 siblings, 1 reply; 3+ messages in thread
From: Sergei Voronezhskii @ 2018-09-13 16:30 UTC (permalink / raw)
  To: tarantool-patches; +Cc: Alexander Turenko

All tests in one suite must use different spaces, because this can
cause tests to affect each other.

Part of #2436
---
 test/wal_off/expirationd.result   | 2 +-
 test/wal_off/expirationd.test.lua | 2 +-
 test/wal_off/oom.result           | 2 +-
 test/wal_off/oom.test.lua         | 2 +-
 test/wal_off/suite.ini            | 2 +-
 test/wal_off/wal_mode.result      | 2 +-
 test/wal_off/wal_mode.test.lua    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/wal_off/expirationd.result b/test/wal_off/expirationd.result
index affb9b259..a924bf692 100644
--- a/test/wal_off/expirationd.result
+++ b/test/wal_off/expirationd.result
@@ -8,7 +8,7 @@ env = require('test_run')
 test_run = env.new()
 ---
 ...
-s0 = box.schema.space.create('tweedledum')
+s0 = box.schema.space.create('tweedledex')
 ---
 ...
 i0 = s0:create_index('primary', { type = 'tree', parts = {1, 'unsigned'}, unique = true })
diff --git a/test/wal_off/expirationd.test.lua b/test/wal_off/expirationd.test.lua
index 804e9ccb2..bf40259eb 100644
--- a/test/wal_off/expirationd.test.lua
+++ b/test/wal_off/expirationd.test.lua
@@ -2,7 +2,7 @@ fiber = require('fiber')
 -- test for expirationd. iterator must continue iterating after space insert/delete
 env = require('test_run')
 test_run = env.new()
-s0 = box.schema.space.create('tweedledum')
+s0 = box.schema.space.create('tweedledex')
 i0 = s0:create_index('primary', { type = 'tree', parts = {1, 'unsigned'}, unique = true })
 s0:insert{20000}
 test_run:cmd("setopt delimiter ';'")
diff --git a/test/wal_off/oom.result b/test/wal_off/oom.result
index c47d16c46..6e446585f 100644
--- a/test/wal_off/oom.result
+++ b/test/wal_off/oom.result
@@ -9,7 +9,7 @@ test_run:cmd("push filter 'error: Failed to allocate [0-9]+ ' to 'error: Failed
 ---
 - true
 ...
-space = box.schema.space.create('tweedledum')
+space = box.schema.space.create('tweedledoom')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal_off/oom.test.lua b/test/wal_off/oom.test.lua
index 5c0ab8e73..e690966a1 100644
--- a/test/wal_off/oom.test.lua
+++ b/test/wal_off/oom.test.lua
@@ -3,7 +3,7 @@ test_run = env.new()
 test_run:cmd('restart server default')
 test_run:cmd("push filter 'error: Failed to allocate [0-9]+ ' to 'error: Failed to allocate <NUM> '")
 
-space = box.schema.space.create('tweedledum')
+space = box.schema.space.create('tweedledoom')
 index = space:create_index('primary', { type = 'hash' })
 test_run:cmd("setopt delimiter ';'")
 i = 1;
diff --git a/test/wal_off/suite.ini b/test/wal_off/suite.ini
index ad19eab10..cbb7cb341 100644
--- a/test/wal_off/suite.ini
+++ b/test/wal_off/suite.ini
@@ -2,4 +2,4 @@
 core = tarantool
 script = wal.lua
 description = tarantool/box, wal_mode = none
-is_parallel = False
+is_parallel = True
diff --git a/test/wal_off/wal_mode.result b/test/wal_off/wal_mode.result
index c07faf744..3047d80fb 100644
--- a/test/wal_off/wal_mode.result
+++ b/test/wal_off/wal_mode.result
@@ -5,7 +5,7 @@ box.cfg.wal_mode
 ---
 - none
 ...
-space = box.schema.space.create('tweedledum')
+space = box.schema.space.create('tweedledee')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal_off/wal_mode.test.lua b/test/wal_off/wal_mode.test.lua
index 79f4ce967..d9f886e8f 100644
--- a/test/wal_off/wal_mode.test.lua
+++ b/test/wal_off/wal_mode.test.lua
@@ -1,7 +1,7 @@
 test_run = require('test_run').new()
 
 box.cfg.wal_mode
-space = box.schema.space.create('tweedledum')
+space = box.schema.space.create('tweedledee')
 index = space:create_index('primary', { type = 'hash' })
 space:insert{1}
 space:insert{2}
-- 
2.18.0

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [tarantool-patches] [PATCH] test: enable parallel mode for wall_off tests
@ 2018-09-17 13:11 Sergei Voronezhskii
  0 siblings, 0 replies; 3+ messages in thread
From: Sergei Voronezhskii @ 2018-09-17 13:11 UTC (permalink / raw)
  To: tarantool-patches; +Cc: Alexander Turenko

Use the proper way to cleanup tests.

Part of #2436
---
 test/wal_off/oom.result     | 4 ++--
 test/wal_off/oom.test.lua   | 4 ++--
 test/wal_off/suite.ini      | 2 +-
 test/wal_off/tuple.result   | 2 +-
 test/wal_off/tuple.test.lua | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/wal_off/oom.result b/test/wal_off/oom.result
index c47d16c46..65bb8c670 100644
--- a/test/wal_off/oom.result
+++ b/test/wal_off/oom.result
@@ -4,7 +4,7 @@ env = require('test_run')
 test_run = env.new()
 ---
 ...
-test_run:cmd('restart server default')
+test_run:cmd('restart server default with cleanup=1')
 test_run:cmd("push filter 'error: Failed to allocate [0-9]+ ' to 'error: Failed to allocate <NUM> '")
 ---
 - true
@@ -231,7 +231,7 @@ t = nil
 ---
 ...
 -- https://github.com/tarantool/tarantool/issues/962 index:delete() failed
-test_run:cmd('restart server default')
+test_run:cmd('restart server default with cleanup=1')
 arena_bytes = box.cfg.memtx_memory
 ---
 ...
diff --git a/test/wal_off/oom.test.lua b/test/wal_off/oom.test.lua
index 5c0ab8e73..89dba3f06 100644
--- a/test/wal_off/oom.test.lua
+++ b/test/wal_off/oom.test.lua
@@ -1,6 +1,6 @@
 env = require('test_run')
 test_run = env.new()
-test_run:cmd('restart server default')
+test_run:cmd('restart server default with cleanup=1')
 test_run:cmd("push filter 'error: Failed to allocate [0-9]+ ' to 'error: Failed to allocate <NUM> '")
 
 space = box.schema.space.create('tweedledum')
@@ -80,7 +80,7 @@ space:drop()
 t = nil
 
 -- https://github.com/tarantool/tarantool/issues/962 index:delete() failed
-test_run:cmd('restart server default')
+test_run:cmd('restart server default with cleanup=1')
 arena_bytes = box.cfg.memtx_memory
 str = string.rep('a', 15000) -- about size of index memory block
 
diff --git a/test/wal_off/suite.ini b/test/wal_off/suite.ini
index ad19eab10..cbb7cb341 100644
--- a/test/wal_off/suite.ini
+++ b/test/wal_off/suite.ini
@@ -2,4 +2,4 @@
 core = tarantool
 script = wal.lua
 description = tarantool/box, wal_mode = none
-is_parallel = False
+is_parallel = True
diff --git a/test/wal_off/tuple.result b/test/wal_off/tuple.result
index fa431e203..dcbd24daf 100644
--- a/test/wal_off/tuple.result
+++ b/test/wal_off/tuple.result
@@ -4,7 +4,7 @@ env = require('test_run')
 test_run = env.new()
 ---
 ...
-test_run:cmd("restart server default")
+test_run:cmd("restart server default with cleanup=1")
 -- 
 -- Test various tuple bugs which do not require a write ahead log.
 -- 
diff --git a/test/wal_off/tuple.test.lua b/test/wal_off/tuple.test.lua
index 19415a92d..859438f71 100644
--- a/test/wal_off/tuple.test.lua
+++ b/test/wal_off/tuple.test.lua
@@ -1,6 +1,6 @@
 env = require('test_run')
 test_run = env.new()
-test_run:cmd("restart server default")
+test_run:cmd("restart server default with cleanup=1")
 -- 
 -- Test various tuple bugs which do not require a write ahead log.
 -- 
-- 
2.18.0

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-09-17 13:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-13 16:30 [tarantool-patches] [PATCH] test: enable parallel mode for wall_off tests Sergei Voronezhskii
2018-09-15  1:13 ` [tarantool-patches] " Alexander Turenko
2018-09-17 13:11 [tarantool-patches] " Sergei Voronezhskii

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