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 D8D022B532 for ; Fri, 21 Sep 2018 08:44:44 -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 J1h7vRKnCnXu for ; Fri, 21 Sep 2018 08:44:44 -0400 (EDT) Received: from smtp52.i.mail.ru (smtp52.i.mail.ru [94.100.177.112]) (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 988662B50A for ; Fri, 21 Sep 2018 08:44:44 -0400 (EDT) From: Sergei Voronezhskii Subject: [tarantool-patches] [PATCH] test: enable parallel mode for wal_off tests Date: Fri, 21 Sep 2018 15:44:42 +0300 Message-Id: <20180921124442.47554-1-sergw@tarantool.org> In-Reply-To: <20180919165750.ew3lv22q3gbtxdew@tkn_work_nb> References: <20180919165750.ew3lv22q3gbtxdew@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. - tuple + lua needs more defragmented memory - snapshot_stress checks for count of checkpoints - need to cleanup default because of some tests dont drop spaces Part of #2436 --- BRANCH: sergw/enable-parallel-test-wal-off-clean test/wal_off/oom.result | 2 +- test/wal_off/oom.test.lua | 2 +- test/wal_off/suite.ini | 2 +- test/wal_off/tuple.result | 2 +- test/wal_off/tuple.test.lua | 2 +- test/wal_off/wal.lua | 5 +++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/wal_off/oom.result b/test/wal_off/oom.result index c47d16c46..90bc53d22 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 diff --git a/test/wal_off/oom.test.lua b/test/wal_off/oom.test.lua index 5c0ab8e73..8e6e14046 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') 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..6ea3814fc 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..6962f35ad 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. -- diff --git a/test/wal_off/wal.lua b/test/wal_off/wal.lua index 6e4afbe4d..4005e78cd 100644 --- a/test/wal_off/wal.lua +++ b/test/wal_off/wal.lua @@ -2,9 +2,10 @@ box.cfg{ listen = os.getenv("LISTEN"), - memtx_memory = 107374182, + memtx_memory = 157374182, pid_file = "tarantool.pid", - wal_mode = "none" + wal_mode = "none", + checkpoint_count = 100 } require('console').listen(os.getenv('ADMIN')) -- 2.18.0