[tarantool-patches] Re: [PATCH v1 0/2] SQL Tests failed on concurrent launch

[Kirill Shcherbatov]

Ok, let's use cleanup on restart server and squash all changes into one commit.

---
 test/sql/transitive-transactions.result   | 2 ++
 test/sql/transitive-transactions.test.lua | 2 ++
 test/sql/view_delayed_wal.result          | 2 +-
 test/sql/view_delayed_wal.test.lua        | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/sql/transitive-transactions.result b/test/sql/transitive-transactions.result
index 37b563a..e617cf1 100644
--- a/test/sql/transitive-transactions.result
+++ b/test/sql/transitive-transactions.result
@@ -118,6 +118,8 @@ box.space.PARENT:select();
   - [2, 2]
 ...
 -- Cleanup
+box.sql.execute('PRAGMA defer_foreign_keys = 0;')
+
 box.sql.execute('DROP TABLE child;');
 ---
 ...
diff --git a/test/sql/transitive-transactions.test.lua b/test/sql/transitive-transactions.test.lua
index 14a1e8c..718f951 100644
--- a/test/sql/transitive-transactions.test.lua
+++ b/test/sql/transitive-transactions.test.lua
@@ -60,6 +60,8 @@ fk_defer();
 box.space.CHILD:select();
 box.space.PARENT:select();
 
+box.sql.execute('PRAGMA defer_foreign_keys = 0;')
+
 -- Cleanup
 box.sql.execute('DROP TABLE child;');
 box.sql.execute('DROP TABLE parent;');
diff --git a/test/sql/view_delayed_wal.result b/test/sql/view_delayed_wal.result
index 50efbee..3b68eda 100644
--- a/test/sql/view_delayed_wal.result
+++ b/test/sql/view_delayed_wal.result
@@ -100,4 +100,4 @@ box.space.V2
 -- Since deletion via Lua doesn't remove entry from
 -- SQL data dictionary we have to restart instance to clean up.
 --
-test_run:cmd('restart server default')
+test_run:cmd('restart server default with cleanup=1')
diff --git a/test/sql/view_delayed_wal.test.lua b/test/sql/view_delayed_wal.test.lua
index 630c52b..cca75ad 100644
--- a/test/sql/view_delayed_wal.test.lua
+++ b/test/sql/view_delayed_wal.test.lua
@@ -42,4 +42,4 @@ box.space.V2
 -- Since deletion via Lua doesn't remove entry from
 -- SQL data dictionary we have to restart instance to clean up.
 --
-test_run:cmd('restart server default')
+test_run:cmd('restart server default with cleanup=1')
-- 
2.7.4