From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 B09644765E5 for ; Wed, 23 Dec 2020 15:36:48 +0300 (MSK) From: sergeyb@tarantool.org Date: Wed, 23 Dec 2020 15:36:12 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v3 5/5] test: remove dead code in Python tests end extra newlines List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org, lvasiliev@tarantool.org From: Sergey Bronnikov Closes #5538 --- test/replication-py/init_storage.test.py | 6 +++--- test/replication-py/swap.test.py | 9 +-------- test/xlog-py/dup_key.test.py | 7 ++----- test/xlog-py/lsn_gap.test.py | 1 - 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/test/replication-py/init_storage.test.py b/test/replication-py/init_storage.test.py index 43ebc8afb..a6e2d6563 100644 --- a/test/replication-py/init_storage.test.py +++ b/test/replication-py/init_storage.test.py @@ -21,7 +21,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()") @@ -42,7 +42,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() @@ -61,7 +61,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 b162ae241..ce1682641 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 = "%s:%s" % 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 caf2478a9..5ca4f147d 100644 --- a/test/xlog-py/dup_key.test.py +++ b/test/xlog-py/dup_key.test.py @@ -3,10 +3,8 @@ 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 -#""" +# 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() @@ -53,4 +51,3 @@ print("") server.admin("box.space.test:get{1}") server.admin("box.space.test:get{2}") server.admin("box.space.test:len()") - 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{}") - -- 2.25.1