summaryrefslogtreecommitdiff
path: root/test/fixtures.py
diff options
context:
space:
mode:
authorJeff Widman <jeff@jeffwidman.com>2019-08-21 18:47:22 -0700
committerGitHub <noreply@github.com>2019-08-21 18:47:22 -0700
commite49caeb3ebdd36eb4d18a517bc402f8e89dfdbee (patch)
treee29f121c7979c96b9850cd3633d2ecb54d340657 /test/fixtures.py
parent5bc25292b8bb5b20ba2fff481fdc77b9909d0831 (diff)
downloadkafka-python-e49caeb3ebdd36eb4d18a517bc402f8e89dfdbee.tar.gz
Minor test cleanup (#1885)
Remove unused import, whitespace, etc. No functional changes, just cleaning it up so the diffs of later changes are cleaner.
Diffstat (limited to 'test/fixtures.py')
-rw-r--r--test/fixtures.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/test/fixtures.py b/test/fixtures.py
index 3e59e94..ff6b687 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -23,9 +23,11 @@ from test.service import ExternalService, SpawnedService
log = logging.getLogger(__name__)
+
def random_string(length):
return "".join(random.choice(string.ascii_letters) for i in range(length))
+
def version_str_to_tuple(version_str):
"""Transform a version string into a tuple.
@@ -33,11 +35,13 @@ def version_str_to_tuple(version_str):
"""
return tuple(map(int, version_str.split('.')))
+
def version():
if 'KAFKA_VERSION' not in os.environ:
return ()
return version_str_to_tuple(os.environ['KAFKA_VERSION'])
+
def get_open_port():
sock = socket.socket()
sock.bind(("", 0))
@@ -45,6 +49,7 @@ def get_open_port():
sock.close()
return port
+
def gen_ssl_resources(directory):
os.system("""
cd {0}
@@ -74,6 +79,7 @@ def gen_ssl_resources(directory):
-file cert-signed -storepass foobar -noprompt
""".format(directory))
+
class Fixture(object):
kafka_version = os.environ.get('KAFKA_VERSION', '0.11.0.2')
scala_version = os.environ.get("SCALA_VERSION", '2.8.0')
@@ -158,6 +164,7 @@ class Fixture(object):
def dump_logs(self):
self.child.dump_logs()
+
class ZookeeperFixture(Fixture):
@classmethod
def instance(cls):
@@ -496,7 +503,7 @@ class KafkaFixture(Fixture):
proc = subprocess.Popen(args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = proc.communicate()
if proc.returncode != 0:
- if not 'kafka.common.TopicExistsException' in stdout:
+ if 'kafka.common.TopicExistsException' not in stdout:
self.out("Failed to create topic %s" % (topic_name,))
self.out(stdout)
self.out(stderr)