From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Aleksandr Lyapunov <alyapunov@tarantool.org>,
Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v2 1/2] Revert "Fix flaky test engine/ddl"
Date: Fri, 4 Dec 2020 11:05:39 +0300 [thread overview]
Message-ID: <b83125d4e0de45c0e50eb36ca2da759b6b1c65a1.1607036572.git.avtikhon@tarantool.org> (raw)
In-Reply-To: <cover.1607036572.git.avtikhon@tarantool.org>
Found that the previous fix of the engine/ddl.test.lua test committed
with:
5f96ee5907672bd32dd7fe8dad144ac3d328187f ('Fix flaky test engine/ddl')
did not fix the issue #4353 in real and it was reverted.
Needed for #4353
---
test/engine/ddl.result | 15 ++++++---------
test/engine/ddl.test.lua | 14 ++++++--------
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/test/engine/ddl.result b/test/engine/ddl.result
index 8b44d1ee1..b7c04aafe 100644
--- a/test/engine/ddl.result
+++ b/test/engine/ddl.result
@@ -2556,23 +2556,20 @@ ch:get()
---
- true
...
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.sk:count()
---
- true
...
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.tk:count()
---
- true
...
inspector:cmd("restart server default")
-inspector = require('test_run').new()
----
-...
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.sk:count()
---
- true
...
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.tk:count()
---
- true
...
@@ -2580,11 +2577,11 @@ box.snapshot()
---
- ok
...
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.sk:count()
---
- true
...
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.tk:count()
---
- true
...
diff --git a/test/engine/ddl.test.lua b/test/engine/ddl.test.lua
index 1d77705dd..7d408807f 100644
--- a/test/engine/ddl.test.lua
+++ b/test/engine/ddl.test.lua
@@ -1016,17 +1016,15 @@ _ = fiber.create(function() gen_load() ch:put(true) end)
_ = box.space.test:create_index('tk', {unique = true, parts = {3, 'unsigned'}})
ch:get()
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.sk:count()
+box.space.test.index.pk:count() == box.space.test.index.tk:count()
inspector:cmd("restart server default")
-inspector = require('test_run').new()
-
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.sk:count()
+box.space.test.index.pk:count() == box.space.test.index.tk:count()
box.snapshot()
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
-inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
+box.space.test.index.pk:count() == box.space.test.index.sk:count()
+box.space.test.index.pk:count() == box.space.test.index.tk:count()
box.space.test:drop()
--
2.24.1 (Apple Git-126)
next prev parent reply other threads:[~2020-12-04 8:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 8:05 [Tarantool-patches] [PATCH v2 0/2] test: flaky hang vinyl/ddl.test.lua test Alexander V. Tikhonov
2020-12-04 8:05 ` Alexander V. Tikhonov [this message]
2020-12-04 8:05 ` [Tarantool-patches] [PATCH v2 2/2] " Alexander V. Tikhonov
2020-12-04 8:19 ` Aleksandr Lyapunov
2020-12-04 8:34 ` Aleksandr Lyapunov
2020-12-04 8:34 ` [Tarantool-patches] [PATCH v2 0/2] " Aleksandr Lyapunov
2020-12-04 9:35 ` Kirill Yukhin
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=b83125d4e0de45c0e50eb36ca2da759b6b1c65a1.1607036572.git.avtikhon@tarantool.org \
--to=avtikhon@tarantool.org \
--cc=alyapunov@tarantool.org \
--cc=kyukhin@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 1/2] Revert "Fix flaky test engine/ddl"' \
/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