From: Alexander Turenko <alexander.turenko@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH] test: ensure instances are stopped in tctl test Date: Fri, 15 Nov 2019 04:19:55 +0300 [thread overview] Message-ID: <bdd0329a21e08270a3d7d12d7e56e66b68946a20.1573780655.git.alexander.turenko@tarantool.org> (raw) 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
next reply other threads:[~2019-11-15 1:20 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-15 1:19 Alexander Turenko [this message] 2019-11-15 21:31 ` Vladislav Shpilevoy 2019-11-15 21:56 ` Alexander Turenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=bdd0329a21e08270a3d7d12d7e56e66b68946a20.1573780655.git.alexander.turenko@tarantool.org \ --to=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] test: ensure instances are stopped in tctl test' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox