From: Serge Petrenko <sergepetrenko@tarantool.org> To: vdavydov.dev@gmail.com Cc: tarantool-patches@freelists.org, Serge Petrenko <sergepetrenko@tarantool.org> Subject: [PATCH] test: fix app-tap/tarantoolctl sporadic failure Date: Thu, 16 Aug 2018 18:24:00 +0300 [thread overview] Message-ID: <20180816152400.4237-1-sergepetrenko@tarantool.org> (raw) In rare cases this test failed on `tarantoolctl status` after `tarantoolctl stop` due to `tarantoolctl stop` taking too much time to unlink pid file. Fix this by waiting for pid file deletion in test. Closes #3557 --- https://github.com/tarantool/tarantool/issues/3557 https://github.com/tarantool/tarantool/tree/sp/gh-3557-tarantoolctl-test-fix test/app-tap/tarantoolctl.test.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/app-tap/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua index 6946c8312..83a8bfc37 100755 --- a/test/app-tap/tarantoolctl.test.lua +++ b/test/app-tap/tarantoolctl.test.lua @@ -34,6 +34,13 @@ local function recursive_rmdir(path) end end +local function wait_delete(path) + path = fio.abspath(path) + while fio.path.exists(path) do + fiber.sleep(0.0001) + end +end + ffi.cdef[[ typedef int32_t pid_t; int kill(pid_t pid, int sig); @@ -157,6 +164,7 @@ test:plan(6) do local dir = fio.tempdir() local code = [[ box.cfg{memtx_memory = 104857600} ]] + local pid_path = fio.pathjoin(dir, 'script.pid') create_script(dir, 'script.lua', code) local status, err = pcall(function() @@ -168,6 +176,7 @@ do check_ok(test_i, dir, 'start', 'script', 1, nil, "is already running") check_ok(test_i, dir, 'status', 'script', 0, nil, "is running") check_ok(test_i, dir, 'stop', 'script', 0, nil, "Stopping") + wait_delete(pid_path) check_ok(test_i, dir, 'status', 'script', 1, nil, "is stopped") check_ok(test_i, dir, 'stop', 'script', 0, nil, "is not running") check_ok(test_i, dir, 'status', 'script', 1, nil, "is stopped" ) -- 2.15.2 (Apple Git-101.1)
next reply other threads:[~2018-08-16 15:24 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-16 15:24 Serge Petrenko [this message] 2018-08-16 19:42 ` Vladimir Davydov 2018-08-17 6:47 ` [tarantool-patches] " Serge Petrenko 2018-08-17 8:32 ` Vladimir Davydov
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=20180816152400.4237-1-sergepetrenko@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH] test: fix app-tap/tarantoolctl sporadic failure' \ /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