Re: [Tarantool-patches] [PATCH 2/6] test: remove dead code in Python tests end extra newline

[Leonid Vasiliev <lvasiliev@tarantool.org>]

Hi! Thank you for the patch.
LGTM.

On 07.12.2020 10:46, sergeyb@tarantool.org wrote:
> From: Sergey Bronnikov <sergeyb@tarantool.org>
> 
> ---
>   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{}")
> -
>