openstack/deb-python-kafka
Code Issues Proposed changes

Add kafka 0.8.1.1 to integration tests.

Browse Source 
- previous 0.8.1 src appears to have actually been 0.8.1.1
  based on git submodule commit.  So technically this adds back 0.8.1
  to the test suite.
This commit is contained in:
Dana Powers
2014-08-12 21:58:22 -07:00
parent d629b57a80
commit e35835719e
6 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -9,6 +9,7 @@ env:
- -
- KAFKA_VERSION=0.8.0 - KAFKA_VERSION=0.8.0
- KAFKA_VERSION=0.8.1 - KAFKA_VERSION=0.8.1
- KAFKA_VERSION=0.8.1.1
before_install: before_install:
- sudo apt-get install libsnappy-dev - sudo apt-get install libsnappy-dev

1
README.md
View File

@@ -204,4 +204,5 @@ Then run the tests against supported Kafka versions:
```shell ```shell
KAFKA_VERSION=0.8.0 tox KAFKA_VERSION=0.8.0 tox
KAFKA_VERSION=0.8.1 tox KAFKA_VERSION=0.8.1 tox
KAFKA_VERSION=0.8.1.1 tox
``` ```

2
build_integration.sh
View File

@@ -4,7 +4,7 @@ if [ -z "$SCALA_VERSION" ]; then
SCALA_VERSION=2.8.0 SCALA_VERSION=2.8.0
fi fi
if [ -z "$KAFKA_VERSION" && -z "$TRAVIS" ]; then 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 fi
pushd servers pushd servers
mkdir -p dist mkdir -p dist

15
test/fixtures.py
View File

@@ -60,21 +60,6 @@ class Fixture(object):
def test_resource(cls, filename): def test_resource(cls, filename):
return os.path.join(cls.project_root, "servers", cls.kafka_version, "resources", filename) 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 @classmethod
def kafka_run_class_args(cls, *args): def kafka_run_class_args(cls, *args):
result = [os.path.join(cls.kafka_root, 'bin', 'kafka-run-class.sh')] result = [os.path.join(cls.kafka_root, 'bin', 'kafka-run-class.sh')]

2
test/test_client_integration.py
View File

@@ -53,7 +53,7 @@ class TestKafkaClientIntegration(KafkaIntegrationTestCase):
# Offset Tests # # Offset Tests #
#################### ####################
@kafka_versions("0.8.1") @kafka_versions("0.8.1", "0.8.1.1")
def test_commit_fetch_offsets(self): def test_commit_fetch_offsets(self):
req = OffsetCommitRequest(self.topic, 0, 42, "metadata") req = OffsetCommitRequest(self.topic, 0, 42, "metadata")
(resp,) = self.client.send_offset_commit_request("group", [req]) (resp,) = self.client.send_offset_commit_request("group", [req])

2
test/test_consumer_integration.py
View File

@@ -213,7 +213,7 @@ class TestConsumerIntegration(KafkaIntegrationTestCase):
big_consumer.stop() big_consumer.stop()
@kafka_versions("0.8.1") @kafka_versions("0.8.1", "0.8.1.1")
def test_offset_behavior__resuming_behavior(self): def test_offset_behavior__resuming_behavior(self):
msgs1 = self.send_messages(0, range(0, 100)) msgs1 = self.send_messages(0, range(0, 100))
msgs2 = self.send_messages(1, range(100, 200)) msgs2 = self.send_messages(1, range(100, 200))