Merge pull request #72 from confluentinc/pytest_timeouts

Pytest timeouts

Author: edenhill

.travis.yml

@@ -4,8 +4,9 @@ python:
   - "3.4"
 before_install:
   - bash tools/bootstrap-librdkafka.sh v0.9.2 tmp-build
+  - pip install pytest-timeout
 install:
   - pip install -v --global-option=build_ext --global-option="-Itmp-build/include/" --global-option="-Ltmp-build/lib" .
 env:
   - LD_LIBRARY_PATH=$PWD/tmp-build/lib
-script: py.test --ignore=tmp-build
+script: py.test -v --timeout 20 --ignore=tmp-build

tests/test_Consumer.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
-from confluent_kafka import Consumer, TopicPartition, KafkaError, KafkaException, TIMESTAMP_NOT_AVAILABLE
+from confluent_kafka import Consumer, TopicPartition, KafkaError, KafkaException, TIMESTAMP_NOT_AVAILABLE, libversion
+import pytest
 
 
 def test_basic_api():
@@ -64,8 +65,13 @@ def dummy_assign_revoke (consumer, partitions):
     kc.close()
 
 
+# librdkafka <=0.9.2 has a race-issue where it will hang indefinately
+# if a commit is issued when no coordinator is available.
+@pytest.mark.skipif(libversion()[1] <= 0x000902ff,
+                    reason="requires librdkafka >0.9.2")
 def test_on_commit ():
     """ Verify that on_commit is only called once per commit() (issue #71) """
+
     class CommitState (object):
         def __init__(self, topic, partition):
             self.topic = topic

tox.ini

@@ -2,8 +2,10 @@
 envlist = flake8,py27,py34,py35
 
 [testenv]
-deps = pytest 
-commands = py.test
+deps =
+     pytest
+     pytest-timeout
+commands = py.test -v --timeout 20 --ignore=tmp-build
 
 [testenv:flake8]
 deps = flake8
@@ -13,6 +15,6 @@ commands = flake8
 testpaths = tests
 
 [flake8]
-exclude = venv,env,.env,.tox,.toxenv,.git,build,docs
+exclude = venv*,env,.env,.tox,.toxenv,.git,build,docs,tmp-build
 max-line-length = 119
 accept-encodings = utf-8