From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp60.i.mail.ru (smtp60.i.mail.ru [217.69.128.40]) (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 C167745C304 for ; Wed, 9 Dec 2020 23:21:19 +0300 (MSK) References: <3b3cc3b83d9c85a773e5cc46708409768d901213.1607326642.git.sergeyb@tarantool.org> From: Leonid Vasiliev Message-ID: Date: Wed, 9 Dec 2020 23:20:22 +0300 MIME-Version: 1.0 In-Reply-To: <3b3cc3b83d9c85a773e5cc46708409768d901213.1607326642.git.sergeyb@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Tarantool-patches] [PATCH 2/6] test: remove dead code in Python tests end extra newline List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: sergeyb@tarantool.org, tarantool-patches@dev.tarantool.org Cc: alexander.turenko@tarantool.org Hi! Thank you for the patch. LGTM. On 07.12.2020 10:46, sergeyb@tarantool.org wrote: > From: Sergey Bronnikov > > --- > test/replication-py/init_storage.test.py | 6 +++--- > test/replication-py/swap.test.py | 9 +-------- > test/xlog-py/dup_key.test.py | 5 ----- > test/xlog-py/lsn_gap.test.py | 1 - > 4 files changed, 4 insertions(+), 17 deletions(-) > > diff --git a/test/replication-py/init_storage.test.py b/test/replication-py/init_storage.test.py > index 30ba75405..04279b69e 100644 > --- a/test/replication-py/init_storage.test.py > +++ b/test/replication-py/init_storage.test.py > @@ -20,7 +20,7 @@ master.admin("for k = 1, 9 do space:insert{k, k*k} end") > > replica = TarantoolServer(server.ini) > replica.script = "replication-py/replica.lua" > -replica.vardir = server.vardir #os.path.join(server.vardir, 'replica') > +replica.vardir = server.vardir > replica.rpl_master = master > replica.deploy() > replica.admin("box.space.test:select()") > @@ -41,7 +41,7 @@ lsn = master.get_lsn(master_id) > > replica = TarantoolServer(server.ini) > replica.script = "replication-py/replica.lua" > -replica.vardir = server.vardir #os.path.join(server.vardir, 'replica') > +replica.vardir = server.vardir > replica.rpl_master = master > replica.deploy() > > @@ -60,7 +60,7 @@ print("-------------------------------------------------------------") > server.stop() > replica = TarantoolServer(server.ini) > replica.script = "replication-py/replica.lua" > -replica.vardir = server.vardir #os.path.join(server.vardir, 'replica') > +replica.vardir = server.vardir > replica.rpl_master = master > replica.deploy(wait=False) > > diff --git a/test/replication-py/swap.test.py b/test/replication-py/swap.test.py > index c5718cffd..d2117775a 100644 > --- a/test/replication-py/swap.test.py > +++ b/test/replication-py/swap.test.py > @@ -45,7 +45,7 @@ os.putenv("MASTER", master.uri) > # replica server > replica = TarantoolServer() > replica.script = "replication-py/replica.lua" > -replica.vardir = server.vardir #os.path.join(server.vardir, 'replica') > +replica.vardir = server.vardir > replica.deploy() > replica.admin("while box.info.id == 0 do require('fiber').sleep(0.01) end") > replica.uri = "{}:{}@{}".format(LOGIN, PASSWORD, replica.iproto.uri) > @@ -56,13 +56,6 @@ for engine in engines: > master.admin("s = box.schema.space.create('{}', {{ engine = '{}'}})".format(engine, engine)) > master.admin("index = s:create_index('primary', {type = 'tree'})") > > -### gh-343: replica.cc must not add login and password to proc title > -#status = replica.get_param("status") > -#host_port = "{}:{}".format(master.iproto.uri) > -#m = re.search(r"replica/(.*)/.*", status) > -#if not m or m.group(1) != host_port: > -# print("invalid box.info.status", status, "expected host:port", host_port) > - > master_id = master.get_param("id") > replica_id = replica.get_param("id") > > diff --git a/test/xlog-py/dup_key.test.py b/test/xlog-py/dup_key.test.py > index b1442c520..a40133ef2 100644 > --- a/test/xlog-py/dup_key.test.py > +++ b/test/xlog-py/dup_key.test.py > @@ -3,11 +3,6 @@ from __future__ import print_function > import os > import yaml > > -#print """ > -#A test case for https://bugs.launchpad.net/tarantool/+bug/1052018 > -#panic_on_wal_error doesn't work for duplicate key errors > -#""" > - > server.stop() > server.deploy() > > diff --git a/test/xlog-py/lsn_gap.test.py b/test/xlog-py/lsn_gap.test.py > index 8da6166a2..b80b97146 100644 > --- a/test/xlog-py/lsn_gap.test.py > +++ b/test/xlog-py/lsn_gap.test.py > @@ -38,4 +38,3 @@ print("") > > # missing tuple from removed xlog > server.admin("box.space.test:select{}") > - >