diff options
| author | Jeff Widman <jeff@jeffwidman.com> | 2018-11-13 11:57:45 -0800 |
|---|---|---|
| committer | Jeff Widman <jeff@jeffwidman.com> | 2018-11-18 00:21:18 -0800 |
| commit | 1d443638e22c2d360086b8d7cee8b5d930741d12 (patch) | |
| tree | 9e60f53f4a791b306acd6f1a2223557ead1ed750 /test | |
| parent | f3105a434f3bd2fb3f8899e4861e187e786b03da (diff) | |
| download | kafka-python-1d443638e22c2d360086b8d7cee8b5d930741d12.tar.gz | |
Be explicit with tuples for %s formatting
Fix #1633
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures.py | 8 | ||||
| -rw-r--r-- | test/test_metrics.py | 2 | ||||
| -rw-r--r-- | test/test_producer.py | 2 | ||||
| -rw-r--r-- | test/testutil.py | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/test/fixtures.py b/test/fixtures.py index 76e3071..6f7fc3f 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -102,7 +102,7 @@ class Fixture(object): def kafka_run_class_env(self): env = os.environ.copy() env['KAFKA_LOG4J_OPTS'] = "-Dlog4j.configuration=file:%s" % \ - self.test_resource("log4j.properties") + (self.test_resource("log4j.properties"),) return env @classmethod @@ -110,7 +110,7 @@ class Fixture(object): log.info('Rendering %s from template %s', target_file.strpath, source_file) with open(source_file, "r") as handle: template = handle.read() - assert len(template) > 0, 'Empty template %s' % source_file + assert len(template) > 0, 'Empty template %s' % (source_file,) with open(target_file.strpath, "w") as handle: handle.write(template.format(**binding)) handle.flush() @@ -257,7 +257,7 @@ class KafkaFixture(Fixture): # TODO: checking for port connection would be better than scanning logs # until then, we need the pattern to work across all supported broker versions # The logging format changed slightly in 1.0.0 - self.start_pattern = r"\[Kafka ?Server (id=)?%d\],? started" % broker_id + self.start_pattern = r"\[Kafka ?Server (id=)?%d\],? started" % (broker_id,) self.zookeeper = zookeeper self.zk_chroot = zk_chroot @@ -291,7 +291,7 @@ class KafkaFixture(Fixture): "%s:%d" % (self.zookeeper.host, self.zookeeper.port), "create", - "/%s" % self.zk_chroot, + "/%s" % (self.zk_chroot,), "kafka-python") env = self.kafka_run_class_env() proc = subprocess.Popen(args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/test/test_metrics.py b/test/test_metrics.py index 8d35f55..308ea58 100644 --- a/test/test_metrics.py +++ b/test/test_metrics.py @@ -469,7 +469,7 @@ def test_reporter(metrics): for key in list(expected.keys()): metrics = expected.pop(key) - expected['foo.%s' % key] = metrics + expected['foo.%s' % (key,)] = metrics assert expected == foo_reporter.snapshot() diff --git a/test/test_producer.py b/test/test_producer.py index 16da618..d6b94e8 100644 --- a/test/test_producer.py +++ b/test/test_producer.py @@ -65,7 +65,7 @@ def test_end_to_end(kafka_broker, compression): except StopIteration: break - assert msgs == set(['msg %d' % i for i in range(messages)]) + assert msgs == set(['msg %d' % (i,) for i in range(messages)]) consumer.close() diff --git a/test/testutil.py b/test/testutil.py index 6f6cafb..a8227cf 100644 --- a/test/testutil.py +++ b/test/testutil.py @@ -32,7 +32,7 @@ def kafka_versions(*versions): op_str = s[0:2] # >= <= v_str = s[2:] else: - raise ValueError('Unrecognized kafka version / operator: %s' % s) + raise ValueError('Unrecognized kafka version / operator: %s' % (s,)) op_map = { '=': operator.eq, |