From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp34.i.mail.ru (smtp34.i.mail.ru [94.100.177.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 4E2EF452566 for ; Fri, 15 Nov 2019 04:20:04 +0300 (MSK) From: Alexander Turenko Date: Fri, 15 Nov 2019 04:19:55 +0300 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] test: ensure instances are stopped in tctl test List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org The problem appears after 6c627af390c3fd521ffef77c443aeb3f5cb0b713 ('test: tarantoolctl: verify delayed box.cfg()'), where the test case was changed and it doesn't more assume an error at the instance start. So we need to stop it to prevent a situation when instances are stays after `make test`. Fixes #4600. --- https://github.com/tarantool/tarantool/issues/4600 https://github.com/tarantool/tarantool/tree/Totktonada/gh-4600-fix-tarantoolctl-test BTW, thanks for the report! That was my mistake. test/app-tap/tarantoolctl.test.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/app-tap/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua index f38820805..7a07860f2 100755 --- a/test/app-tap/tarantoolctl.test.lua +++ b/test/app-tap/tarantoolctl.test.lua @@ -189,8 +189,13 @@ do local status, err = pcall(function() test:test("basic test", function(test_i) - test_i:plan(18) - check_ok(test_i, dir, 'start', 'delayed_box_cfg', 0, nil, "Starting instance") + test_i:plan(20) + local script = 'delayed_box_cfg' + check_ok(test_i, dir, 'start', script, 0, nil, "Starting instance") + tctl_wait_start(dir, script) + check_ok(test_i, dir, 'stop', script, 0, nil, "Stopping") + tctl_wait_stop(dir, script) + check_ok(test_i, dir, 'start', 'script', 0, nil, "Starting instance") tctl_wait_start(dir, 'script') check_ok(test_i, dir, 'status', 'script', 0, nil, "is running") -- 2.22.0