From 7dd214233afecaf832826931b1e95d9da637d4c3 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 20 Feb 2015 20:50:19 +0300
Subject: [PATCH] tests: rename suite 'wal' to 'wal_off'.

Don't use space with id 0.
---
 test/box/admin.result                          | 4 ++--
 test/box/admin.test.lua                        | 4 ++--
 test/box/reconfigure.result                    | 4 ++--
 test/box/reconfigure.test.lua                  | 4 ++--
 test/{wal => wal_off}/alter.result             | 2 +-
 test/{wal => wal_off}/alter.test.lua           | 2 +-
 test/{wal => wal_off}/func_max.result          | 0
 test/{wal => wal_off}/func_max.test.lua        | 0
 test/{wal => wal_off}/lua.result               | 4 ++--
 test/{wal => wal_off}/lua.test.lua             | 4 ++--
 test/{wal => wal_off}/oom.result               | 2 +-
 test/{wal => wal_off}/oom.test.lua             | 2 +-
 test/{wal => wal_off}/rtree_benchmark.result   | 2 +-
 test/{wal => wal_off}/rtree_benchmark.test.lua | 2 +-
 test/{wal => wal_off}/suite.ini                | 0
 test/{wal => wal_off}/tuple.result             | 2 +-
 test/{wal => wal_off}/tuple.test.lua           | 2 +-
 test/{wal => wal_off}/wal.lua                  | 0
 test/{wal => wal_off}/wal_mode.result          | 2 +-
 test/{wal => wal_off}/wal_mode.test.lua        | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)
 rename test/{wal => wal_off}/alter.result (88%)
 rename test/{wal => wal_off}/alter.test.lua (85%)
 rename test/{wal => wal_off}/func_max.result (100%)
 rename test/{wal => wal_off}/func_max.test.lua (100%)
 rename test/{wal => wal_off}/lua.result (94%)
 rename test/{wal => wal_off}/lua.test.lua (93%)
 rename test/{wal => wal_off}/oom.result (99%)
 rename test/{wal => wal_off}/oom.test.lua (95%)
 rename test/{wal => wal_off}/rtree_benchmark.result (97%)
 rename test/{wal => wal_off}/rtree_benchmark.test.lua (97%)
 rename test/{wal => wal_off}/suite.ini (100%)
 rename test/{wal => wal_off}/tuple.result (94%)
 rename test/{wal => wal_off}/tuple.test.lua (93%)
 rename test/{wal => wal_off}/wal.lua (100%)
 rename test/{wal => wal_off}/wal_mode.result (92%)
 rename test/{wal => wal_off}/wal_mode.test.lua (87%)

diff --git a/test/box/admin.result b/test/box/admin.result
index ce03541fb1..bd184b122a 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -1,9 +1,9 @@
 --# stop server default
 --# start server default
-space = box.schema.space.create('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum')
 ---
 ...
-index = space:create_index('primary', { type = 'hash' })
+index = space:create_index('primary')
 ---
 ...
 --# push filter 'listen: .*' to 'listen: <uri>'
diff --git a/test/box/admin.test.lua b/test/box/admin.test.lua
index 98a4b16f6d..4c82e3dae1 100644
--- a/test/box/admin.test.lua
+++ b/test/box/admin.test.lua
@@ -1,8 +1,8 @@
 --# stop server default
 --# start server default
 
-space = box.schema.space.create('tweedledum', { id = 0 })
-index = space:create_index('primary', { type = 'hash' })
+space = box.schema.space.create('tweedledum')
+index = space:create_index('primary')
 
 --# push filter 'listen: .*' to 'listen: <uri>'
 help()
diff --git a/test/box/reconfigure.result b/test/box/reconfigure.result
index fbed002b40..d0fcabd95c 100644
--- a/test/box/reconfigure.result
+++ b/test/box/reconfigure.result
@@ -33,10 +33,10 @@ box.cfg.io_collect_interval
 -- Valgrind reports use of not initialized memory after 'reload
 -- configuration'
 --
-space = box.schema.space.create('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum')
 ---
 ...
-index = space:create_index('primary', { type = 'hash'})
+index = space:create_index('primary')
 ---
 ...
 space:insert{1, 'tuple'}
diff --git a/test/box/reconfigure.test.lua b/test/box/reconfigure.test.lua
index da3968288a..0ba0a64e5f 100644
--- a/test/box/reconfigure.test.lua
+++ b/test/box/reconfigure.test.lua
@@ -13,8 +13,8 @@ box.cfg.io_collect_interval
 -- Valgrind reports use of not initialized memory after 'reload
 -- configuration'
 --
-space = box.schema.space.create('tweedledum', { id = 0 })
-index = space:create_index('primary', { type = 'hash'})
+space = box.schema.space.create('tweedledum')
+index = space:create_index('primary')
 space:insert{1, 'tuple'}
 box.snapshot()
 box.cfg{}
diff --git a/test/wal/alter.result b/test/wal_off/alter.result
similarity index 88%
rename from test/wal/alter.result
rename to test/wal_off/alter.result
index 4ff8a35472..8c96667dd6 100644
--- a/test/wal/alter.result
+++ b/test/wal_off/alter.result
@@ -9,7 +9,7 @@ box.schema.FORMAT_ID_MAX
 --# setopt delimiter ';'
 -- too many formats
 for k = 1, box.schema.FORMAT_ID_MAX, 1 do
-    local s = box.schema.create_space('space'..k)
+    local s = box.schema.space.create('space'..k)
     table.insert(spaces, s)
 end;
 ---
diff --git a/test/wal/alter.test.lua b/test/wal_off/alter.test.lua
similarity index 85%
rename from test/wal/alter.test.lua
rename to test/wal_off/alter.test.lua
index d9f5430c6e..fa16b826a8 100644
--- a/test/wal/alter.test.lua
+++ b/test/wal_off/alter.test.lua
@@ -4,7 +4,7 @@ box.schema.FORMAT_ID_MAX
 --# setopt delimiter ';'
 -- too many formats
 for k = 1, box.schema.FORMAT_ID_MAX, 1 do
-    local s = box.schema.create_space('space'..k)
+    local s = box.schema.space.create('space'..k)
     table.insert(spaces, s)
 end;
 #spaces;
diff --git a/test/wal/func_max.result b/test/wal_off/func_max.result
similarity index 100%
rename from test/wal/func_max.result
rename to test/wal_off/func_max.result
diff --git a/test/wal/func_max.test.lua b/test/wal_off/func_max.test.lua
similarity index 100%
rename from test/wal/func_max.test.lua
rename to test/wal_off/func_max.test.lua
diff --git a/test/wal/lua.result b/test/wal_off/lua.result
similarity index 94%
rename from test/wal/lua.result
rename to test/wal_off/lua.result
index 07d561f998..7b1af439d6 100644
--- a/test/wal/lua.result
+++ b/test/wal_off/lua.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index1 = space:create_index('primary', { type ='hash', parts = {1, 'str'}, unique = true })
@@ -47,7 +47,7 @@ space:drop()
 -- A test case for https://github.com/tarantool/tarantool/issues/65
 -- Space does not exist error on repetitive access to space 0 in Lua
 --
-space = box.schema.create_space('tweedledum', {id=0})
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal/lua.test.lua b/test/wal_off/lua.test.lua
similarity index 93%
rename from test/wal/lua.test.lua
rename to test/wal_off/lua.test.lua
index 28b6e29752..459c5f521a 100644
--- a/test/wal/lua.test.lua
+++ b/test/wal_off/lua.test.lua
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index1 = space:create_index('primary', { type ='hash', parts = {1, 'str'}, unique = true })
 index2 = space:create_index('secondary', { type = 'tree', parts = {2, 'num'}, unique = false })
 -- A test case for Bug#1042738
@@ -34,7 +34,7 @@ space:drop()
 -- A test case for https://github.com/tarantool/tarantool/issues/65
 -- Space does not exist error on repetitive access to space 0 in Lua
 --
-space = box.schema.create_space('tweedledum', {id=0})
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 
 --# setopt delimiter ';'
diff --git a/test/wal/oom.result b/test/wal_off/oom.result
similarity index 99%
rename from test/wal/oom.result
rename to test/wal_off/oom.result
index 6300cf178a..d029f02252 100644
--- a/test/wal/oom.result
+++ b/test/wal_off/oom.result
@@ -1,6 +1,6 @@
 --# stop server default
 --# start server default
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal/oom.test.lua b/test/wal_off/oom.test.lua
similarity index 95%
rename from test/wal/oom.test.lua
rename to test/wal_off/oom.test.lua
index 160390a8c5..03b58728e7 100644
--- a/test/wal/oom.test.lua
+++ b/test/wal_off/oom.test.lua
@@ -1,6 +1,6 @@
 --# stop server default
 --# start server default
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 --# setopt delimiter ';'
 i = 1;
diff --git a/test/wal/rtree_benchmark.result b/test/wal_off/rtree_benchmark.result
similarity index 97%
rename from test/wal/rtree_benchmark.result
rename to test/wal_off/rtree_benchmark.result
index 5ea134ef69..c4b4c4071f 100644
--- a/test/wal/rtree_benchmark.result
+++ b/test/wal_off/rtree_benchmark.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('rtreebench')
+s = box.schema.space.create('rtreebench')
 ---
 ...
 _ = s:create_index('primary')
diff --git a/test/wal/rtree_benchmark.test.lua b/test/wal_off/rtree_benchmark.test.lua
similarity index 97%
rename from test/wal/rtree_benchmark.test.lua
rename to test/wal_off/rtree_benchmark.test.lua
index 34c2a8a3d4..37dec0fda2 100644
--- a/test/wal/rtree_benchmark.test.lua
+++ b/test/wal_off/rtree_benchmark.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('rtreebench')
+s = box.schema.space.create('rtreebench')
 _ = s:create_index('primary')
 _ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
diff --git a/test/wal/suite.ini b/test/wal_off/suite.ini
similarity index 100%
rename from test/wal/suite.ini
rename to test/wal_off/suite.ini
diff --git a/test/wal/tuple.result b/test/wal_off/tuple.result
similarity index 94%
rename from test/wal/tuple.result
rename to test/wal_off/tuple.result
index 26d6507f8f..e6e13f54b8 100644
--- a/test/wal/tuple.result
+++ b/test/wal_off/tuple.result
@@ -7,7 +7,7 @@
 -- gh-372 Assertion with a function that inserts increasingly
 -- large tables
 -- -------------------------------------------------------
-tester = box.schema.create_space('tester')
+tester = box.schema.space.create('tester')
 ---
 ...
 index = tester:create_index('primary',{})
diff --git a/test/wal/tuple.test.lua b/test/wal_off/tuple.test.lua
similarity index 93%
rename from test/wal/tuple.test.lua
rename to test/wal_off/tuple.test.lua
index 9965eb3090..c0d0697d66 100644
--- a/test/wal/tuple.test.lua
+++ b/test/wal_off/tuple.test.lua
@@ -7,7 +7,7 @@
 -- gh-372 Assertion with a function that inserts increasingly
 -- large tables
 -- -------------------------------------------------------
-tester = box.schema.create_space('tester')
+tester = box.schema.space.create('tester')
 index = tester:create_index('primary',{})
 --# setopt delimiter ';'
 function tuple_max()
diff --git a/test/wal/wal.lua b/test/wal_off/wal.lua
similarity index 100%
rename from test/wal/wal.lua
rename to test/wal_off/wal.lua
diff --git a/test/wal/wal_mode.result b/test/wal_off/wal_mode.result
similarity index 92%
rename from test/wal/wal_mode.result
rename to test/wal_off/wal_mode.result
index 07f5870879..9ca59bbc60 100644
--- a/test/wal/wal_mode.result
+++ b/test/wal_off/wal_mode.result
@@ -2,7 +2,7 @@ box.cfg.wal_mode
 ---
 - none
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal/wal_mode.test.lua b/test/wal_off/wal_mode.test.lua
similarity index 87%
rename from test/wal/wal_mode.test.lua
rename to test/wal_off/wal_mode.test.lua
index 14a022b3f9..6ff4b06548 100644
--- a/test/wal/wal_mode.test.lua
+++ b/test/wal_off/wal_mode.test.lua
@@ -1,5 +1,5 @@
 box.cfg.wal_mode
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 space:insert{1}
 space:insert{2}
-- 
GitLab