From 924f287b619ae3b888e3ae70795e857d007d227b Mon Sep 17 00:00:00 2001 From: Geoff Anderson Date: Tue, 25 Aug 2015 14:29:28 -0700 Subject: [PATCH 1/4] Updated kafkatest package to include *.properties files when installed --- tests/MANIFEST.in | 1 + tests/setup.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tests/MANIFEST.in diff --git a/tests/MANIFEST.in b/tests/MANIFEST.in new file mode 100644 index 0000000000000..36a3e3b60330b --- /dev/null +++ b/tests/MANIFEST.in @@ -0,0 +1 @@ +recursive-include kafkatest/services/templates *.properties diff --git a/tests/setup.py b/tests/setup.py index a2fa71aaaf111..00e58dd21c252 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -17,11 +17,12 @@ from setuptools import find_packages, setup setup(name="kafkatest", - version="0.8.3-SNAPSHOT", + version="0.8.3.dev0", description="Apache Kafka System Tests", author="Apache Kafka", platforms=["any"], license="apache2.0", packages=find_packages(), - requires=["ducktape(==0.3.0)"] + include_package_data=True, + install_requires=["ducktape==0.3.2"] ) From b22e99a5993c30f7d4e14c3f7640e2ecddaedb5d Mon Sep 17 00:00:00 2001 From: Geoff Anderson Date: Tue, 25 Aug 2015 14:29:28 -0700 Subject: [PATCH 2/4] Updated kafkatest package to include *.properties files when installed --- tests/MANIFEST.in | 1 + tests/setup.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tests/MANIFEST.in diff --git a/tests/MANIFEST.in b/tests/MANIFEST.in new file mode 100644 index 0000000000000..36a3e3b60330b --- /dev/null +++ b/tests/MANIFEST.in @@ -0,0 +1 @@ +recursive-include kafkatest/services/templates *.properties diff --git a/tests/setup.py b/tests/setup.py index 2a538806cf401..00e58dd21c252 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -17,11 +17,12 @@ from setuptools import find_packages, setup setup(name="kafkatest", - version="0.8.3-SNAPSHOT", + version="0.8.3.dev0", description="Apache Kafka System Tests", author="Apache Kafka", platforms=["any"], license="apache2.0", packages=find_packages(), - requires=["ducktape(==0.3.1)"] + include_package_data=True, + install_requires=["ducktape==0.3.2"] ) From a496cc9fc535a0a452be7a7b2e87253b71330c33 Mon Sep 17 00:00:00 2001 From: Geoff Anderson Date: Thu, 27 Aug 2015 19:27:39 -0700 Subject: [PATCH 3/4] Add license to MANIFEST.in --- tests/MANIFEST.in | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/MANIFEST.in b/tests/MANIFEST.in index 36a3e3b60330b..cda3ed54ef32d 100644 --- a/tests/MANIFEST.in +++ b/tests/MANIFEST.in @@ -1 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + recursive-include kafkatest/services/templates *.properties From 6ce6f4ea794d6f8544e851974d8ec527d97a857a Mon Sep 17 00:00:00 2001 From: Geoff Anderson Date: Thu, 27 Aug 2015 19:28:24 -0700 Subject: [PATCH 4/4] Removed debug logging of every consumed message - too much storage overhead. --- tests/kafkatest/services/console_consumer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/kafkatest/services/console_consumer.py b/tests/kafkatest/services/console_consumer.py index ffde6a2713bea..9286654007039 100644 --- a/tests/kafkatest/services/console_consumer.py +++ b/tests/kafkatest/services/console_consumer.py @@ -174,7 +174,6 @@ def _worker(self, idx, node): if self.message_validator is not None: msg = self.message_validator(msg) if msg is not None: - self.logger.debug("consumed a message: " + str(msg)) self.messages_consumed[idx].append(msg) def start_node(self, node):