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 5E3D9469719
 for <tarantool-patches@dev.tarantool.org>;
 Wed, 11 Nov 2020 08:21:39 +0300 (MSK)
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Wed, 11 Nov 2020 08:21:34 +0300
Message-Id: <740979c74ca1966b63e7e65b1827b80c3d329308.1605071861.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1605071860.git.avtikhon@tarantool.org>
References: <cover.1605071860.git.avtikhon@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH v1 2/2] Update tests for the new
	tarantoolctl format
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: Alexander Turenko <alexander.turenko@tarantool.org>, Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@dev.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