From: Alexander Turenko <alexander.turenko@tarantool.org>
To: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Alexander Turenko <alexander.turenko@tarantool.org>,
tarantool-patches@freelists.org
Subject: [PATCH] test: fix app/fiber.test.lua flaky fails
Date: Sun, 2 Dec 2018 20:05:07 +0300 [thread overview]
Message-ID: <b48597f7d265a7326ffdff807530f3035e55e393.1543769965.git.alexander.turenko@tarantool.org> (raw)
Fixes #3852.
---
https://github.com/tarantool/tarantool/issues/3852
https://github.com/tarantool/tarantool/tree/Totktonada/gh-3852-fix-flaky-app-fiber-test-lua
The branch is based on top of 2.1. Please, cherry-pick the fix to 1.10
too.
test/app/fiber.result | 9 +++++----
test/app/fiber.test.lua | 6 ++++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/test/app/fiber.result b/test/app/fiber.result
index 8c050cc59..ab7c1941b 100644
--- a/test/app/fiber.result
+++ b/test/app/fiber.result
@@ -1105,9 +1105,6 @@ function test5()
end;
---
...
-local status;
----
-...
f, status = test5();
---
...
@@ -1142,8 +1139,12 @@ status;
---
- suspended
...
-f:status();
+test_run:wait_cond(function()
+ status = f:status()
+ return status == 'dead', status
+end, 10);
---
+- true
- dead
...
-- test side fiber in transaction
diff --git a/test/app/fiber.test.lua b/test/app/fiber.test.lua
index 69a582546..2762047e4 100644
--- a/test/app/fiber.test.lua
+++ b/test/app/fiber.test.lua
@@ -467,7 +467,6 @@ function test5()
f:set_joinable(true)
return f, f:status()
end;
-local status;
f, status = test5();
status;
f:status();
@@ -482,7 +481,10 @@ function test6()
end;
f, status = test6();
status;
-f:status();
+test_run:wait_cond(function()
+ status = f:status()
+ return status == 'dead', status
+end, 10);
-- test side fiber in transaction
s = box.schema.space.create("test");
--
2.19.2
next reply other threads:[~2018-12-02 17:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-02 17:05 Alexander Turenko [this message]
2018-12-03 8:42 ` 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=b48597f7d265a7326ffdff807530f3035e55e393.1543769965.git.alexander.turenko@tarantool.org \
--to=alexander.turenko@tarantool.org \
--cc=tarantool-patches@freelists.org \
--cc=vdavydov.dev@gmail.com \
--subject='Re: [PATCH] test: fix app/fiber.test.lua flaky fails' \
/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