From: sergeyb@tarantool.org To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org, imun@tarantool.org Cc: alexander.turenko@tarantool.org Subject: [Tarantool-patches] [PATCH 4/4] test: remove dead code in Python tests end extra newline Date: Fri, 11 Dec 2020 11:42:25 +0300 [thread overview] Message-ID: <64faf8a1d1571ca757aa1cdb3e5f1f3aadaa4088.1607675470.git.sergeyb@tarantool.org> (raw) In-Reply-To: <cover.1607675470.git.sergeyb@tarantool.org> From: Sergey Bronnikov <sergeyb@tarantool.org> Closes #5538 --- 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 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 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{}") - -- 2.25.1
next prev parent reply other threads:[~2020-12-11 8:43 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1607675470.git.sergeyb@tarantool.org> 2020-12-11 8:42 ` [Tarantool-patches] [PATCH 1/4] test: convert print to function and make quotes use consistent sergeyb 2020-12-13 17:58 ` Vladislav Shpilevoy 2020-12-14 11:44 ` Sergey Bronnikov 2020-12-15 10:05 ` Leonid Vasiliev 2020-12-15 11:51 ` Sergey Bronnikov 2020-12-20 16:47 ` Vladislav Shpilevoy 2020-12-23 12:34 ` Sergey Bronnikov 2020-12-11 8:42 ` [Tarantool-patches] [PATCH 2/4] test: make dict.items() compatible with Python 3.x sergeyb 2020-12-13 17:58 ` Vladislav Shpilevoy 2020-12-15 12:40 ` Leonid Vasiliev 2020-12-11 8:42 ` [Tarantool-patches] [PATCH 3/4] test: make convert to hex " sergeyb 2020-12-15 11:55 ` Leonid Vasiliev 2020-12-16 14:04 ` Sergey Bronnikov 2020-12-17 18:26 ` Leonid Vasiliev 2020-12-22 8:15 ` [Tarantool-patches] [PATCH] test: make strings compatible with Python 3 sergeyb 2020-12-23 9:59 ` Leonid Vasiliev 2020-12-23 10:35 ` Sergey Bronnikov 2020-12-23 11:09 ` Leonid Vasiliev 2020-12-22 8:19 ` [Tarantool-patches] [PATCH 3/4] test: make convert to hex compatible with Python 3.x Sergey Bronnikov 2020-12-23 10:00 ` Leonid Vasiliev 2020-12-11 8:42 ` sergeyb [this message] 2020-12-15 12:51 ` [Tarantool-patches] [PATCH 4/4] test: remove dead code in Python tests end extra newline Leonid Vasiliev 2020-12-15 13:00 ` Sergey Bronnikov 2020-12-13 19:02 ` [Tarantool-patches] [PATCH v3 0/4] Support Python 3 in tests and PEPify source code Sergey Bronnikov 2020-12-23 10:07 ` Leonid Vasiliev 2020-12-23 12:42 ` Sergey Bronnikov 2020-12-23 23:51 ` Leonid Vasiliev
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=64faf8a1d1571ca757aa1cdb3e5f1f3aadaa4088.1607675470.git.sergeyb@tarantool.org \ --to=sergeyb@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=imun@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 4/4] test: remove dead code in Python tests end extra newline' \ /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