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 3C7102ACB9 for ; Tue, 18 Sep 2018 12:10:29 -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 H3peLZR5aI0T for ; Tue, 18 Sep 2018 12:10:29 -0400 (EDT) Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (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 9BA0B2651D for ; Tue, 18 Sep 2018 12:10:28 -0400 (EDT) From: Sergei Voronezhskii Subject: [tarantool-patches] [PATCH v2] test: enable parallel mode for wall_off tests Date: Tue, 18 Sep 2018 19:10:25 +0300 Message-Id: <20180918161025.21769-1-sergw@tarantool.org> In-Reply-To: <20180917133145.vzyvounwxvuclujz@tkn_work_nb> References: <20180917133145.vzyvounwxvuclujz@tkn_work_nb> 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: Alexander Turenko Use the proper way to cleanup tests. Part of #2436 --- test/wal_off/lua.result | 1 + test/wal_off/lua.test.lua | 1 + test/wal_off/oom.result | 4 ++-- test/wal_off/oom.test.lua | 4 ++-- test/wal_off/snapshot_stress.result | 1 + test/wal_off/snapshot_stress.test.lua | 1 + test/wal_off/suite.ini | 2 +- test/wal_off/tuple.result | 2 +- test/wal_off/tuple.test.lua | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/test/wal_off/lua.result b/test/wal_off/lua.result index f075feb24..738cad27f 100644 --- a/test/wal_off/lua.result +++ b/test/wal_off/lua.result @@ -4,6 +4,7 @@ env = require('test_run') test_run = env.new() --- ... +test_run:cmd("restart server default with cleanup=1") space = box.schema.space.create('tweedledum') --- ... diff --git a/test/wal_off/lua.test.lua b/test/wal_off/lua.test.lua index 7daf9f3f6..02ec9e795 100644 --- a/test/wal_off/lua.test.lua +++ b/test/wal_off/lua.test.lua @@ -1,5 +1,6 @@ env = require('test_run') test_run = env.new() +test_run:cmd("restart server default with cleanup=1") space = box.schema.space.create('tweedledum') index1 = space:create_index('primary', { type ='hash', parts = {1, 'string'}, unique = true }) index2 = space:create_index('secondary', { type = 'tree', parts = {2, 'unsigned'}, unique = false }) 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 '") --- - 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 '") 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/snapshot_stress.result b/test/wal_off/snapshot_stress.result index 29cea8c04..22e97c6c8 100644 --- a/test/wal_off/snapshot_stress.result +++ b/test/wal_off/snapshot_stress.result @@ -8,6 +8,7 @@ env = require('test_run') test_run = env.new() --- ... +test_run:cmd("restart server default with cleanup=1") -- Settings: You may increase theese value to make test longer -- number of worker fibers: workers_count = 80 diff --git a/test/wal_off/snapshot_stress.test.lua b/test/wal_off/snapshot_stress.test.lua index 34b3e7b78..990d5e63b 100644 --- a/test/wal_off/snapshot_stress.test.lua +++ b/test/wal_off/snapshot_stress.test.lua @@ -4,6 +4,7 @@ -- Snapshots are made every snapshot_interval seconds and then checked for consistency env = require('test_run') test_run = env.new() +test_run:cmd("restart server default with cleanup=1") -- Settings: You may increase theese value to make test longer -- number of worker fibers: workers_count = 80 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