diff options
| author | David Arthur <mumrah@gmail.com> | 2013-04-02 20:38:55 -0400 |
|---|---|---|
| committer | David Arthur <mumrah@gmail.com> | 2013-04-02 20:38:55 -0400 |
| commit | 7c604697be54aac6989d7e8b7fb6f8e41699ade9 (patch) | |
| tree | 2800a085a224fd273c00c2404424b014ec74faed /test/integration.py | |
| parent | 53da81c1761764aec4bcee49cdd3464c925fed09 (diff) | |
| parent | bff6cae885e9750b468d475dac3ec712bf69e853 (diff) | |
| download | kafka-python-7c604697be54aac6989d7e8b7fb6f8e41699ade9.tar.gz | |
Merge branch 'master' into 0.80.8
Conflicts:
README.md
kafka-src
kafka/client.py
kafka/consumer.py
kafka/protocol.py
setup.py
test/integration.py
Diffstat (limited to 'test/integration.py')
| -rw-r--r-- | test/integration.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/integration.py b/test/integration.py index a1fcce7..de91130 100644 --- a/test/integration.py +++ b/test/integration.py @@ -6,6 +6,7 @@ import shlex import shutil import socket import subprocess +import sys import tempfile from threading import Thread, Event import time @@ -73,7 +74,8 @@ class KafkaFixture(Thread): args = shlex.split("java -cp %s org.apache.zookeeper.ZooKeeperMain create /%s kafka-python" % (cp, self.zk_chroot)) proc = subprocess.Popen(args) ret = proc.wait() - assert ret == 0 + if ret != 0: + sys.exit(1) # Start Kafka |