This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 506e311 FIX: CI error at ./test/py/TestServer.py:178:26: F507 '...' %
... has 1 placeholder(s) but 6 substitution(s) FIX: CI error at
./test/crossrunner/compat.py:11:21: E741 ambiguous variable name 'l' Patch:
Jens Geyer
506e311 is described below
commit 506e311c381677928ab68fd62e441deb24f2f7c3
Author: Jens Geyer <[email protected]>
AuthorDate: Sun May 17 22:48:51 2020 +0200
FIX: CI error at ./test/py/TestServer.py:178:26: F507 '...' % ... has 1
placeholder(s) but 6 substitution(s)
FIX: CI error at ./test/crossrunner/compat.py:11:21: E741 ambiguous
variable name 'l'
Patch: Jens Geyer
This closes #2147
---
test/crossrunner/compat.py | 6 +++---
test/py/TestServer.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/crossrunner/compat.py b/test/crossrunner/compat.py
index f1ca91b..932a48c 100644
--- a/test/crossrunner/compat.py
+++ b/test/crossrunner/compat.py
@@ -8,9 +8,9 @@ if sys.version_info[0] == 2:
bin_args = map(lambda a: a.decode(_ENCODE), args)
return os.path.join(*bin_args).encode(_ENCODE)
- def str_join(s, l):
- bin_args = map(lambda a: a.decode(_ENCODE), l)
- b = s.decode(_ENCODE)
+ def str_join(left, right):
+ bin_args = map(lambda a: a.decode(_ENCODE), right)
+ b = left.decode(_ENCODE)
return b.join(bin_args).encode(_ENCODE)
logfile_open = open
diff --git a/test/py/TestServer.py b/test/py/TestServer.py
index 4d90f8f..81ae1ad 100755
--- a/test/py/TestServer.py
+++ b/test/py/TestServer.py
@@ -175,7 +175,7 @@ class TestHandler(object):
def testMulti(self, arg0, arg1, arg2, arg3, arg4, arg5):
if options.verbose > 1:
- logging.info('testMulti(%s)' % [arg0, arg1, arg2, arg3, arg4,
arg5])
+ logging.info('testMulti(%s, %s, %s, %s, %s, %s)' % (arg0, arg1,
arg2, arg3, arg4, arg5))
return Xtruct(string_thing='Hello2',
byte_thing=arg0, i32_thing=arg1, i64_thing=arg2)
