diff options
| -rw-r--r-- | test/fixtures.py | 11 | ||||
| -rw-r--r-- | test/service.py | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/test/fixtures.py b/test/fixtures.py index 9375932..0ddcf11 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -74,7 +74,6 @@ class Fixture(object): def kafka_run_class_env(self): env = os.environ.copy() - env['LOG_DIR'] = os.path.join(self.tmp_dir, 'logs') env['KAFKA_LOG4J_OPTS'] = "-Dlog4j.configuration=file:%s" % self.test_resource("log4j.properties") return env @@ -115,6 +114,11 @@ class ZookeeperFixture(Fixture): self.tmp_dir = None self.child = None + def kafka_run_class_env(self): + env = super(ZookeeperFixture, self).kafka_run_class_env() + env['LOG_DIR'] = os.path.join(self.tmp_dir, 'logs') + return env + def out(self, message): log.info("*** Zookeeper [%s:%d]: %s", self.host, self.port, message) @@ -205,6 +209,11 @@ class KafkaFixture(Fixture): self.child = None self.running = False + def kafka_run_class_env(self): + env = super(KafkaFixture, self).kafka_run_class_env() + env['LOG_DIR'] = os.path.join(self.tmp_dir, 'logs') + return env + def out(self, message): log.info("*** Kafka [%s:%d]: %s", self.host, self.port, message) diff --git a/test/service.py b/test/service.py index 3b91984..0e47835 100644 --- a/test/service.py +++ b/test/service.py @@ -3,6 +3,7 @@ import os import re import select import subprocess +import sys import threading import time |