Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Alexander Turenko <alexander.turenko@tarantool.org>,
	Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v1 2/2] Update tests for the new tarantoolctl format
Date: Wed, 11 Nov 2020 08:21:34 +0300	[thread overview]
Message-ID: <740979c74ca1966b63e7e65b1827b80c3d329308.1605071861.git.avtikhon@tarantool.org> (raw)
In-Reply-To: <cover.1605071860.git.avtikhon@tarantool.org>

After test-run changed for the new 'tarantoolctl' format for 'restart'
and 'stop' commands some tests had to be updated due to checked it.
---
 test/app/cmdline.result                    | 6 +++++-
 test/app/cmdline.test.lua                  | 3 ++-
 test/replication/bootstrap_leader.result   | 2 +-
 test/replication/bootstrap_leader.test.lua | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/app/cmdline.result b/test/app/cmdline.result
index facb915e2..291d23844 100644
--- a/test/app/cmdline.result
+++ b/test/app/cmdline.result
@@ -18,7 +18,11 @@ string.match(arg[-1], '/tarantool$') ~= nil
 ---
 - true
 ...
-string.match(arg[2], 'app%.lua$') ~= nil
+string.match(arg[0], 'app%.lua$') ~= nil
+---
+- true
+...
+string.match(arg[3], '--signal=9$') ~= nil
 ---
 - true
 ...
diff --git a/test/app/cmdline.test.lua b/test/app/cmdline.test.lua
index 316f761fc..44a3dd7bb 100644
--- a/test/app/cmdline.test.lua
+++ b/test/app/cmdline.test.lua
@@ -4,7 +4,8 @@ string.match(arg[-1], '^/') ~= nil
 string.match(arg[0], '^/') == nil
 
 string.match(arg[-1], '/tarantool$') ~= nil
-string.match(arg[2], 'app%.lua$') ~= nil
+string.match(arg[0], 'app%.lua$') ~= nil
+string.match(arg[3], '--signal=9$') ~= nil
 
 io.type( io.open(arg[-1]) )
 io.type( io.open(arg[0]) )
diff --git a/test/replication/bootstrap_leader.result b/test/replication/bootstrap_leader.result
index 7d1a33d8e..a14c863ab 100644
--- a/test/replication/bootstrap_leader.result
+++ b/test/replication/bootstrap_leader.result
@@ -18,7 +18,7 @@ end;
  | ---
  | ...
 
-test_run:cmd("start server replica1 with wait_load=True, wait=True");
+test_run:cmd("start server replica1 with args='', wait_load=True, wait=True");
  | ---
  | - true
  | ...
diff --git a/test/replication/bootstrap_leader.test.lua b/test/replication/bootstrap_leader.test.lua
index 984a82b8e..48260e8bd 100644
--- a/test/replication/bootstrap_leader.test.lua
+++ b/test/replication/bootstrap_leader.test.lua
@@ -8,7 +8,7 @@ for i = 1,3 do
     test_run:cmd(string.format(create_server_cmd, i, i))
 end;
 
-test_run:cmd("start server replica1 with wait_load=True, wait=True");
+test_run:cmd("start server replica1 with args='', wait_load=True, wait=True");
 test_run:cmd("start server replica2 with args='1,2,3 1.0 100500 0.1', wait_load=False, wait=False");
 test_run:cmd("start server replica3 with args='1,2,3 0.1 0.5 100500', wait_load=True, wait=True");
 
-- 
2.25.1

      parent reply	other threads:[~2020-11-11  5:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-11  5:21 [Tarantool-patches] [PATCH v1 0/2] tarantoolctl: add signal in stop/restart options Alexander V. Tikhonov
2020-11-11  5:21 ` [Tarantool-patches] [PATCH v1 1/2] " Alexander V. Tikhonov
2020-11-11  5:21 ` Alexander V. Tikhonov [this message]

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=740979c74ca1966b63e7e65b1827b80c3d329308.1605071861.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1 2/2] Update tests for the new tarantoolctl format' \
    /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