diff options
| -rw-r--r-- | test/conftest.py | 2 | ||||
| -rw-r--r-- | test/test_consumer.py | 16 | ||||
| -rw-r--r-- | test/test_package.py | 23 | ||||
| -rw-r--r-- | tox.ini | 1 |
4 files changed, 19 insertions, 23 deletions
diff --git a/test/conftest.py b/test/conftest.py index a751d95..ffaae03 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,7 +1,5 @@ from __future__ import absolute_import -import inspect - import pytest from test.fixtures import KafkaFixture, ZookeeperFixture, random_string, version as kafka_version diff --git a/test/test_consumer.py b/test/test_consumer.py index 013529f..4ea01c8 100644 --- a/test/test_consumer.py +++ b/test/test_consumer.py @@ -2,6 +2,7 @@ import sys from mock import MagicMock, patch from . import unittest +import pytest from kafka import SimpleConsumer, KafkaConsumer, MultiProcessConsumer from kafka.errors import ( @@ -11,17 +12,13 @@ from kafka.structs import ( FetchResponsePayload, OffsetAndMessage, OffsetFetchResponsePayload) -class TestKafkaConsumer(unittest.TestCase): - def test_non_integer_partitions(self): - with self.assertRaises(AssertionError): - SimpleConsumer(MagicMock(), 'group', 'topic', partitions=['0']) - +class TestKafkaConsumer: def test_session_timeout_larger_than_request_timeout_raises(self): - with self.assertRaises(KafkaConfigurationError): + with pytest.raises(KafkaConfigurationError): KafkaConsumer(bootstrap_servers='localhost:9092', api_version=(0,9), group_id='foo', session_timeout_ms=60000, request_timeout_ms=40000) def test_fetch_max_wait_larger_than_request_timeout_raises(self): - with self.assertRaises(KafkaConfigurationError): + with pytest.raises(KafkaConfigurationError): KafkaConsumer(bootstrap_servers='localhost:9092', fetch_max_wait_ms=41000, request_timeout_ms=40000) def test_subscription_copy(self): @@ -43,7 +40,12 @@ class TestMultiProcessConsumer(unittest.TestCase): self.assertEqual(fetch_last_known_offsets.call_args[0], (partitions,) ) self.assertEqual(client.get_partition_ids_for_topic.call_count, 0) # pylint: disable=no-member + class TestSimpleConsumer(unittest.TestCase): + def test_non_integer_partitions(self): + with self.assertRaises(AssertionError): + SimpleConsumer(MagicMock(), 'group', 'topic', partitions=['0']) + def test_simple_consumer_failed_payloads(self): client = MagicMock() consumer = SimpleConsumer(client, group=None, diff --git a/test/test_package.py b/test/test_package.py index eb53027..e520f3f 100644 --- a/test/test_package.py +++ b/test/test_package.py @@ -1,28 +1,25 @@ -from . import unittest - - -class TestPackage(unittest.TestCase): +class TestPackage: def test_top_level_namespace(self): import kafka as kafka1 - self.assertEqual(kafka1.KafkaConsumer.__name__, "KafkaConsumer") - self.assertEqual(kafka1.consumer.__name__, "kafka.consumer") - self.assertEqual(kafka1.codec.__name__, "kafka.codec") + assert kafka1.KafkaConsumer.__name__ == "KafkaConsumer" + assert kafka1.consumer.__name__ == "kafka.consumer" + assert kafka1.codec.__name__ == "kafka.codec" def test_submodule_namespace(self): import kafka.client as client1 - self.assertEqual(client1.__name__, "kafka.client") + assert client1.__name__ == "kafka.client" from kafka import client as client2 - self.assertEqual(client2.__name__, "kafka.client") + assert client2.__name__ == "kafka.client" from kafka.client import SimpleClient as SimpleClient1 - self.assertEqual(SimpleClient1.__name__, "SimpleClient") + assert SimpleClient1.__name__ == "SimpleClient" from kafka.codec import gzip_encode as gzip_encode1 - self.assertEqual(gzip_encode1.__name__, "gzip_encode") + assert gzip_encode1.__name__ == "gzip_encode" from kafka import SimpleClient as SimpleClient2 - self.assertEqual(SimpleClient2.__name__, "SimpleClient") + assert SimpleClient2.__name__ == "SimpleClient" from kafka.codec import snappy_encode - self.assertEqual(snappy_encode.__name__, "snappy_encode") + assert snappy_encode.__name__ == "snappy_encode" @@ -20,7 +20,6 @@ deps = xxhash crc32c py26: unittest2 - decorator commands = py.test {posargs:--pylint --pylint-rcfile=pylint.rc --pylint-error-types=EF --cov=kafka --cov-config=.covrc} setenv = |