Tarantool development patches archive
 help / color / mirror / Atom feed
From: Sergei Voronezhskii <sergw@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Alexander Turenko <alexander.turenko@tarantool.org>,
	Vladimir Davydov <vdavydov.dev@gmail.com>
Subject: [PATCH 1/2] test: wait until expected value appear in log
Date: Thu, 18 Oct 2018 01:04:53 +0300	[thread overview]
Message-ID: <20181017220454.90958-2-sergw@tarantool.org> (raw)
In-Reply-To: <20181017220454.90958-1-sergw@tarantool.org>

Sleep for the constant time can't fit the case when we need to wait for
snapshot. System load may change app timings and we got flaky test.
Need to check logfile with delay until timeout or log has expected
entry.

Fixes #3684

Part of #2436, #3232
---
 test/xlog/checkpoint_daemon.result   | 10 +---------
 test/xlog/checkpoint_daemon.test.lua |  7 +------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/test/xlog/checkpoint_daemon.result b/test/xlog/checkpoint_daemon.result
index d5ed666f2..64695293c 100644
--- a/test/xlog/checkpoint_daemon.result
+++ b/test/xlog/checkpoint_daemon.result
@@ -90,15 +90,7 @@ fio.basename(snaps[1], '.snap') >= fio.basename(xlogs[1], '.xlog')
 - true
 ...
 -- gh-2780 check that scheduled snapshots are performed
-fiber.sleep(3 * PERIOD)
----
-...
--- check that it's not first snapshot
-test_run:grep_log("default", "saving snapshot", 400) == nil
----
-- true
-...
-test_run:grep_log("default", "making snapshot", 400) ~= nil
+test_run:wait_log("default", "making snapshot", 400, 1.0 + PERIOD)
 ---
 - true
 ...
diff --git a/test/xlog/checkpoint_daemon.test.lua b/test/xlog/checkpoint_daemon.test.lua
index 4a0aafa84..f27f89da8 100644
--- a/test/xlog/checkpoint_daemon.test.lua
+++ b/test/xlog/checkpoint_daemon.test.lua
@@ -46,18 +46,13 @@ end;
 
 test_run:cmd("setopt delimiter ''");
 
-
-
 #snaps == 2 or snaps
 #xlogs > 0
 
 fio.basename(snaps[1], '.snap') >= fio.basename(xlogs[1], '.xlog')
 
 -- gh-2780 check that scheduled snapshots are performed
-fiber.sleep(3 * PERIOD)
--- check that it's not first snapshot
-test_run:grep_log("default", "saving snapshot", 400) == nil
-test_run:grep_log("default", "making snapshot", 400) ~= nil
+test_run:wait_log("default", "making snapshot", 400, 1.0 + PERIOD)
 
 -- restore default options
 box.cfg{checkpoint_interval = 3600 * 4, checkpoint_count = 4 }
-- 
2.18.0

  reply	other threads:[~2018-10-17 22:04 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-10  7:56 [PATCH] test: enable parallel mode for xlog tests Sergei Voronezhskii
2018-10-10  7:56 ` [PATCH 1/2] test: wait until expected value appear in log Sergei Voronezhskii
2018-10-15  0:29   ` Alexander Turenko
2018-10-17 22:04     ` [PATCH] test: enable parallel mode for xlog tests Sergei Voronezhskii
2018-10-17 22:04       ` Sergei Voronezhskii [this message]
2018-10-21  4:40         ` [PATCH 1/2] test: wait until expected value appear in log Alexander Turenko
2018-10-23 15:00           ` Re[2]: " Sergei Voronezhskii
2018-10-25  2:49             ` Alexander Turenko
2018-10-17 22:04       ` [PATCH 2/2] test: enable parallel mode for xlog tests Sergei Voronezhskii
2018-11-27 13:33         ` [tarantool-patches] " Sergei Voronezhskii
2018-11-28 14:42       ` [tarantool-patches] [PATCH] " Kirill Yukhin
2018-10-10  7:56 ` [PATCH 2/2] " Sergei Voronezhskii

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=20181017220454.90958-2-sergw@tarantool.org \
    --to=sergw@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=vdavydov.dev@gmail.com \
    --subject='Re: [PATCH 1/2] test: wait until expected value appear in log' \
    /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