From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [217.69.128.34])
 (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 1248045C308
 for <tarantool-patches@dev.tarantool.org>;
 Fri,  4 Dec 2020 11:05:48 +0300 (MSK)
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Fri,  4 Dec 2020 11:05:39 +0300
Message-Id: <b83125d4e0de45c0e50eb36ca2da759b6b1c65a1.1607036572.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1607036572.git.avtikhon@tarantool.org>
References: <cover.1607036572.git.avtikhon@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH v2 1/2] Revert "Fix flaky test
	engine/ddl"
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Aleksandr Lyapunov <alyapunov@tarantool.org>, Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@dev.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)