From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 18EAA20027 for ; Mon, 25 Jun 2018 09:39:40 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EdwRz2RZQSuI for ; Mon, 25 Jun 2018 09:39:40 -0400 (EDT) Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 59B9A20026 for ; Mon, 25 Jun 2018 09:39:39 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v1 0/2] SQL Tests failed on concurrent launch References: From: Kirill Shcherbatov Message-ID: <6190b00b-e25c-7789-4179-4d1bbf616a88@tarantool.org> Date: Mon, 25 Jun 2018 16:39:37 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: "n.pettik@corp.mail.ru" 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