diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rwxr-xr-x | build_integration.sh | 2 | ||||
| -rw-r--r-- | test/fixtures.py | 15 | ||||
| -rw-r--r-- | test/test_client_integration.py | 2 | ||||
| -rw-r--r-- | test/test_consumer_integration.py | 2 |
6 files changed, 5 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index d658ae8..22b03a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ env: - - KAFKA_VERSION=0.8.0 - KAFKA_VERSION=0.8.1 + - KAFKA_VERSION=0.8.1.1 before_install: - sudo apt-get install libsnappy-dev @@ -204,4 +204,5 @@ Then run the tests against supported Kafka versions: ```shell KAFKA_VERSION=0.8.0 tox KAFKA_VERSION=0.8.1 tox +KAFKA_VERSION=0.8.1.1 tox ``` diff --git a/build_integration.sh b/build_integration.sh index 3b9b4a7..0166de7 100755 --- a/build_integration.sh +++ b/build_integration.sh @@ -4,7 +4,7 @@ if [ -z "$SCALA_VERSION" ]; then SCALA_VERSION=2.8.0 fi if [ -z "$KAFKA_VERSION" && -z "$TRAVIS" ]; then - KAFKA_VERSION="0.8.0 0.8.1" + KAFKA_VERSION="0.8.0 0.8.1 0.8.1.1" fi pushd servers mkdir -p dist diff --git a/test/fixtures.py b/test/fixtures.py index 00de82c..adb0642 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -61,21 +61,6 @@ class Fixture(object): return os.path.join(cls.project_root, "servers", cls.kafka_version, "resources", filename) @classmethod - def test_classpath(cls): - # ./kafka-src/bin/kafka-run-class.sh is the authority. - jars = ["."] - - # 0.8.0 build path, should contain the core jar and a deps jar - jars.extend(glob.glob(cls.kafka_root + "/core/target/scala-%s/*.jar" % cls.scala_version)) - - # 0.8.1 build path, should contain the core jar and several dep jars - jars.extend(glob.glob(cls.kafka_root + "/core/build/libs/*.jar")) - jars.extend(glob.glob(cls.kafka_root + "/core/build/dependant-libs-%s/*.jar" % cls.scala_version)) - - jars = filter(os.path.exists, map(os.path.abspath, jars)) - return ":".join(jars) - - @classmethod def kafka_run_class_args(cls, *args): result = [os.path.join(cls.kafka_root, 'bin', 'kafka-run-class.sh')] result.extend(args) diff --git a/test/test_client_integration.py b/test/test_client_integration.py index 261d168..49c4b57 100644 --- a/test/test_client_integration.py +++ b/test/test_client_integration.py @@ -53,7 +53,7 @@ class TestKafkaClientIntegration(KafkaIntegrationTestCase): # Offset Tests # #################### - @kafka_versions("0.8.1") + @kafka_versions("0.8.1", "0.8.1.1") def test_commit_fetch_offsets(self): req = OffsetCommitRequest(self.topic, 0, 42, "metadata") (resp,) = self.client.send_offset_commit_request("group", [req]) diff --git a/test/test_consumer_integration.py b/test/test_consumer_integration.py index a6589b3..cb32669 100644 --- a/test/test_consumer_integration.py +++ b/test/test_consumer_integration.py @@ -213,7 +213,7 @@ class TestConsumerIntegration(KafkaIntegrationTestCase): big_consumer.stop() - @kafka_versions("0.8.1") + @kafka_versions("0.8.1", "0.8.1.1") def test_offset_behavior__resuming_behavior(self): msgs1 = self.send_messages(0, range(0, 100)) msgs2 = self.send_messages(1, range(100, 200)) |