diff options
| author | Jens Geyer <jensg@apache.org> | 2020-05-17 22:48:51 +0200 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2020-05-19 00:00:29 +0200 |
| commit | 506e311c381677928ab68fd62e441deb24f2f7c3 (patch) | |
| tree | c1a11c8d7d5bdcea72be82fe6914056026bdbab2 /test | |
| parent | 1ab096c80af1a2bca73aef78675de914a1834fd9 (diff) | |
| download | thrift-506e311c381677928ab68fd62e441deb24f2f7c3.tar.gz | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/crossrunner/compat.py | 6 | ||||
| -rwxr-xr-x | 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 f1ca91bb3..932a48cd6 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 4d90f8f91..81ae1ad62 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) |