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 4/4] test: refactor some requirements to pass the runs Date: Fri, 5 Oct 2018 12:02:15 +0300 [thread overview] Message-ID: <20181005090215.6160-5-sergw@tarantool.org> (raw) In-Reply-To: <20181005090215.6160-1-sergw@tarantool.org> Part of #2436, #3232 --- test/replication/catch.result | 3 +++ test/replication/catch.test.lua | 2 +- test/replication/gc.result | 6 +++--- test/replication/gc.test.lua | 2 +- test/replication/on_replace.result | 3 +++ test/replication/on_replace.test.lua | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/test/replication/catch.result b/test/replication/catch.result index b4ddc5d51..6e160e076 100644 --- a/test/replication/catch.result +++ b/test/replication/catch.result @@ -1,6 +1,9 @@ env = require('test_run') --- ... +fiber = require('fiber') +--- +... test_run = env.new() --- ... diff --git a/test/replication/catch.test.lua b/test/replication/catch.test.lua index 5223e3a24..22adb2868 100644 --- a/test/replication/catch.test.lua +++ b/test/replication/catch.test.lua @@ -1,8 +1,8 @@ env = require('test_run') +fiber = require('fiber') test_run = env.new() engine = test_run:get_cfg('engine') - net_box = require('net.box') errinj = box.error.injection diff --git a/test/replication/gc.result b/test/replication/gc.result index ef6463d87..7725c36d6 100644 --- a/test/replication/gc.result +++ b/test/replication/gc.result @@ -1,6 +1,3 @@ -fio = require 'fio' ---- -... test_run = require('test_run').new() --- ... @@ -13,6 +10,9 @@ replica_set = require('fast_replica') fiber = require('fiber') --- ... +fio = require('fio') +--- +... test_run:cleanup_cluster() --- ... diff --git a/test/replication/gc.test.lua b/test/replication/gc.test.lua index ec3bf6baa..b99253ee5 100644 --- a/test/replication/gc.test.lua +++ b/test/replication/gc.test.lua @@ -1,8 +1,8 @@ -fio = require 'fio' test_run = require('test_run').new() engine = test_run:get_cfg('engine') replica_set = require('fast_replica') fiber = require('fiber') +fio = require('fio') test_run:cleanup_cluster() diff --git a/test/replication/on_replace.result b/test/replication/on_replace.result index 8fef8fb14..2e95b90ea 100644 --- a/test/replication/on_replace.result +++ b/test/replication/on_replace.result @@ -63,6 +63,9 @@ test_run:cmd("switch replica") --- - true ... +fiber = require('fiber') +--- +... while box.space.test:count() < 2 do fiber.sleep(0.01) end --- ... diff --git a/test/replication/on_replace.test.lua b/test/replication/on_replace.test.lua index 23a3313b5..e34832103 100644 --- a/test/replication/on_replace.test.lua +++ b/test/replication/on_replace.test.lua @@ -26,6 +26,7 @@ session_type test_run:cmd("switch default") box.space.test:insert{2} test_run:cmd("switch replica") +fiber = require('fiber') while box.space.test:count() < 2 do fiber.sleep(0.01) end -- -- applier -- 2.18.0
next prev parent reply other threads:[~2018-10-05 9:02 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-27 15:38 [PATCH] test: enable parallel mode for replication tests Sergei Voronezhskii 2018-10-01 1:36 ` Alexander Turenko 2018-10-01 10:41 ` [tarantool-patches] " Alexander Turenko 2018-10-03 14:50 ` Sergei Voronezhskii 2018-10-05 9:02 ` Sergei Voronezhskii 2018-10-05 9:02 ` [PATCH 1/4] test: cleanup replication tests, parallel mode on Sergei Voronezhskii 2018-10-08 19:02 ` Alexander Turenko 2018-10-05 9:02 ` [PATCH 2/4] test: errinj for pause relay_send Sergei Voronezhskii 2018-10-08 19:07 ` Alexander Turenko 2018-10-05 9:02 ` [PATCH 3/4] test: increase timeout to check replica status Sergei Voronezhskii 2018-10-08 19:07 ` Alexander Turenko 2018-10-05 9:02 ` Sergei Voronezhskii [this message] 2018-10-08 19:08 ` [PATCH 4/4] test: refactor some requirements to pass the runs Alexander Turenko
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=20181005090215.6160-5-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 4/4] test: refactor some requirements to pass the runs' \ /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