summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2018-03-22 18:10:32 -0700
committerGitHub <noreply@github.com>2018-03-22 18:10:32 -0700
commite8cb888629210b3c26748a5e2e61ab5df7b95933 (patch)
tree702814ee4f2d8d136339ce383217703430a0bff0
parent18e48dce240eaa7cf714c780c02d1d5cf0b8fca2 (diff)
downloadkafka-python-e8cb888629210b3c26748a5e2e61ab5df7b95933.tar.gz
Fix skipped integration tests if KAFKA_VERSION unset (#1453)
-rw-r--r--test/test_consumer_integration.py3
-rw-r--r--test/test_producer_integration.py6
2 files changed, 9 insertions, 0 deletions
diff --git a/test/test_consumer_integration.py b/test/test_consumer_integration.py
index 78a8a3c..cc036cc 100644
--- a/test/test_consumer_integration.py
+++ b/test/test_consumer_integration.py
@@ -2,6 +2,7 @@ import logging
import os
import time
+import pytest
from six.moves import xrange
import six
@@ -19,12 +20,14 @@ from kafka.structs import (
ProduceRequestPayload, TopicPartition, OffsetAndTimestamp
)
+from test.conftest import version
from test.fixtures import ZookeeperFixture, KafkaFixture
from test.testutil import (
KafkaIntegrationTestCase, kafka_versions, random_string, Timer,
send_messages
)
+@pytest.mark.skipif(not version(), reason="No KAFKA_VERSION set")
def test_kafka_consumer(simple_client, topic, kafka_consumer_factory):
"""Test KafkaConsumer
"""
diff --git a/test/test_producer_integration.py b/test/test_producer_integration.py
index ca0da6a..6cd3d13 100644
--- a/test/test_producer_integration.py
+++ b/test/test_producer_integration.py
@@ -2,6 +2,7 @@ import os
import time
import uuid
+import pytest
from six.moves import range
from kafka import (
@@ -14,9 +15,11 @@ from kafka.errors import UnknownTopicOrPartitionError, LeaderNotAvailableError
from kafka.producer.base import Producer
from kafka.structs import FetchRequestPayload, ProduceRequestPayload
+from test.conftest import version
from test.fixtures import ZookeeperFixture, KafkaFixture
from test.testutil import KafkaIntegrationTestCase, kafka_versions, current_offset
+
# TODO: This duplicates a TestKafkaProducerIntegration method temporarily
# while the migration to pytest is in progress
def assert_produce_request(client, topic, messages, initial_offset, message_ct,
@@ -32,6 +35,7 @@ def assert_produce_request(client, topic, messages, initial_offset, message_ct,
assert current_offset(client, topic, partition) == initial_offset + message_ct
+
def assert_produce_response(resp, initial_offset):
"""Verify that a produce response is well-formed
"""
@@ -39,6 +43,8 @@ def assert_produce_response(resp, initial_offset):
assert resp[0].error == 0
assert resp[0].offset == initial_offset
+
+@pytest.mark.skipif(not version(), reason="No KAFKA_VERSION set")
def test_produce_many_simple(simple_client, topic):
"""Test multiple produces using the SimpleClient
"""