From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 3A93945C304 for ; Tue, 15 Dec 2020 14:51:17 +0300 (MSK) References: <6265c0f8-3b96-04db-0bcd-6bb77dc9fe71@tarantool.org> <31bded2b-32e0-5b65-92d1-9ef08415d3fc@tarantool.org> From: Sergey Bronnikov Message-ID: Date: Tue, 15 Dec 2020 14:51:14 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: en-US Subject: Re: [Tarantool-patches] [PATCH 1/4] test: convert print to function and make quotes use consistent List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Leonid Vasiliev , Vladislav Shpilevoy , tarantool-patches@dev.tarantool.org Cc: alexander.turenko@tarantool.org Hello, thanks for review! On 15.12.2020 13:05, Leonid Vasiliev wrote: > Hi! I looked at the commit 1f34abf6e059532ddfa097e4c1a86030d34341a9 on > the branch, because not all the diff has been attached here (or I can't > find them). > Not all multi-line prints were reverted. Let's finish the revert. > As for the rest of the changes:"I think this patch can be considered > complete." (LGTM) > > Yep, there were some places. Reverted and force-pushed. CI is green [1]. 1. https://gitlab.com/tarantool/tarantool/-/pipelines/230020600 diff --git a/test/box-py/call.test.py b/test/box-py/call.test.py index 75ced1dff..9f508268d 100644 --- a/test/box-py/call.test.py +++ b/test/box-py/call.test.py @@ -23,11 +23,11 @@ call("f1")  # IPROTO required!  call("box.error", 33333, "Hey!") -print("") -print("# A test case for Bug#103491") -print("# server CALL processing bug with name path longer than two") -print("# https://bugs.launchpad.net/tarantool/+bug/1034912") -print("") +print(""" +# A test case for Bug#103491 +# server CALL processing bug with name path longer than two +# https://bugs.launchpad.net/tarantool/+bug/1034912 +""")  admin("f = function() return 'OK' end")  admin("test = {}")  admin("test.f = f") @@ -37,11 +37,11 @@ call("f")  call("test.f")  call("test.test.f") -print("") -print("# Test for Bug #955226") -print("# Lua Numbers are passed back wrongly as strings") -print("#") -print("") +print(""" +# Test for Bug #955226 +# Lua Numbers are passed back wrongly as strings +# +""")  admin("function foo() return 1, 2, '1', '2' end")  call("foo") diff --git a/test/box-py/snapshot.result b/test/box-py/snapshot.result index 034f0bba7..fbaab912f 100644 --- a/test/box-py/snapshot.result +++ b/test/box-py/snapshot.result @@ -44,7 +44,7 @@ space:delete{2}  ...  #  # A test case for http://bugs.launchpad.net/bugs/727174 -# 'tarantool_box crashes when saving snapshot on SIGUSR1' +# "tarantool_box crashes when saving snapshot on SIGUSR1"  #  # Increment the lsn number, to make sure there is no such snapshot yet diff --git a/test/box-py/snapshot.test.py b/test/box-py/snapshot.test.py index 7d660d9bf..e34126ed2 100644 --- a/test/box-py/snapshot.test.py +++ b/test/box-py/snapshot.test.py @@ -41,13 +41,14 @@ os.rmdir(snapshot)  admin("space:delete{1}")  admin("space:delete{2}") -print("#") -print("# A test case for http://bugs.launchpad.net/bugs/727174") -print("# 'tarantool_box crashes when saving snapshot on SIGUSR1'") -print("#\n") +print("""# +# A test case for http://bugs.launchpad.net/bugs/727174 +# "tarantool_box crashes when saving snapshot on SIGUSR1" +#""") -print("# Increment the lsn number, to make sure there is no such snapshot yet") -print("#") +print(""" +# Increment the lsn number, to make sure there is no such snapshot yet +#""")  admin("space:insert{1, 'Test tuple'}") diff --git a/test/xlog-py/misc.test.py b/test/xlog-py/misc.test.py index 3fcda9504..3330a8e57 100644 --- a/test/xlog-py/misc.test.py +++ b/test/xlog-py/misc.test.py @@ -13,9 +13,9 @@ server.stop()  data_path = os.path.join(server.vardir, server.name) -print("") -print("# xlog file must exist after inserts.") -print("") +print(""" +# xlog file must exist after inserts. +""")  filename = str(lsn).zfill(20) + ".xlog"  wal = os.path.join(data_path, filename) @@ -30,9 +30,9 @@ server.admin("index = space:create_index('primary', { type = 'hash' })")  server.stop()  lsn += 2 -print("") -print("# a new xlog must be opened after regular termination.") -print("") +print(""" +# a new xlog must be opened after regular termination. +""")  filename = str(lsn).zfill(20) + ".xlog"  server.start() @@ -49,9 +49,10 @@ if os.access(wal, os.F_OK):    print(".xlog stays around after shutdown")  lsn += 1 -print("") -print("# An xlog file with one record during recovery.") -print("") +print(""" +# An xlog file with one record during recovery. +""") +  server.start()  filename = str(lsn).zfill(20) + ".xlog"  wal = os.path.join(data_path, filename)