diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rwxr-xr-x | build_integration.sh | 4 | ||||
| m--------- | servers/0.8.0/kafka-src (renamed from kafka-src) | 0 | ||||
| -rw-r--r-- | servers/0.8.0/resources/kafka.properties (renamed from test/resources/kafka.properties) | 0 | ||||
| -rw-r--r-- | servers/0.8.0/resources/log4j.properties (renamed from test/resources/log4j.properties) | 0 | ||||
| -rw-r--r-- | servers/0.8.0/resources/zookeeper.properties (renamed from test/resources/zookeeper.properties) | 0 | ||||
| -rw-r--r-- | test/fixtures.py | 7 | ||||
| -rw-r--r-- | tox.ini | 3 |
8 files changed, 11 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 9b9fae9..9f003c2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "kafka-src"] - path = kafka-src - url = git://github.com/apache/kafka.git +[submodule "servers/0.8.0/kafka-src"] + path = servers/0.8.0/kafka-src + url = https://github.com/apache/kafka.git diff --git a/build_integration.sh b/build_integration.sh new file mode 100755 index 0000000..cc5b9fc --- /dev/null +++ b/build_integration.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +git submodule update --init +(cd servers/0.8.0/kafka-src && ./sbt update package assembly-package-dependency) diff --git a/kafka-src b/servers/0.8.0/kafka-src -Subproject 15bb3961d9171c1c54c4c840a554ce2c7616816 +Subproject 15bb3961d9171c1c54c4c840a554ce2c7616816 diff --git a/test/resources/kafka.properties b/servers/0.8.0/resources/kafka.properties index f8732fb..f8732fb 100644 --- a/test/resources/kafka.properties +++ b/servers/0.8.0/resources/kafka.properties diff --git a/test/resources/log4j.properties b/servers/0.8.0/resources/log4j.properties index f863b3b..f863b3b 100644 --- a/test/resources/log4j.properties +++ b/servers/0.8.0/resources/log4j.properties diff --git a/test/resources/zookeeper.properties b/servers/0.8.0/resources/zookeeper.properties index 68e1ef9..68e1ef9 100644 --- a/test/resources/zookeeper.properties +++ b/servers/0.8.0/resources/zookeeper.properties diff --git a/test/fixtures.py b/test/fixtures.py index bb6bc87..af4c145 100644 --- a/test/fixtures.py +++ b/test/fixtures.py @@ -11,14 +11,15 @@ from .service import ExternalService, SpawnedService from .testutil import get_open_port class Fixture(object): - project_root = os.environ.get('PROJECT_ROOT', os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) + kafka_version = os.environ.get('KAFKA_VERSION', '0.8.0') scala_version = os.environ.get("SCALA_VERSION", '2.8.0') - kafka_root = os.environ.get("KAFKA_ROOT", os.path.join(project_root, "kafka-src")) + project_root = os.environ.get('PROJECT_ROOT', os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) + kafka_root = os.environ.get("KAFKA_ROOT", os.path.join(project_root, 'servers', kafka_version, "kafka-src")) ivy_root = os.environ.get('IVY_ROOT', os.path.expanduser("~/.ivy2/cache")) @classmethod def test_resource(cls, filename): - return os.path.join(cls.project_root, "test", "resources", filename) + return os.path.join(cls.project_root, "servers", cls.kafka_version, "resources", filename) @classmethod def test_classpath(cls): @@ -10,6 +10,3 @@ commands = nosetests --with-coverage --cover-erase --cover-package kafka [] setenv = PROJECT_ROOT = {toxinidir} - KAFKA_ROOT = {toxinidir}/kafka-src -[pytest] -norecursedirs = .git .tox build dist kafka-src |