This is an automated email from the ASF dual-hosted git repository.
guozhang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new e7f0196 MINOR: Fixes for streams system tests (#4935)
e7f0196 is described below
commit e7f019690a10306a717b9757a21d5bf01964532e
Author: Bill Bejeck <[email protected]>
AuthorDate: Thu Apr 26 13:04:59 2018 -0400
MINOR: Fixes for streams system tests (#4935)
This PR fixes some regressions introduced into streams system tests and
sets the upgrade tests to ignore until PR #4636 is merged as it has the fixes
for the upgrade tests.
Reviewers: Guozhang Wang <[email protected]>
---
tests/kafkatest/services/streams.py | 8 +++-----
tests/kafkatest/tests/streams/streams_upgrade_test.py | 9 ++++++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tests/kafkatest/services/streams.py
b/tests/kafkatest/services/streams.py
index a4b902a..ec6a081 100644
--- a/tests/kafkatest/services/streams.py
+++ b/tests/kafkatest/services/streams.py
@@ -15,16 +15,15 @@
import os.path
import signal
-
import streams_property
-
from ducktape.services.service import Service
from ducktape.utils.util import wait_until
from kafkatest.directory_layout.kafka_path import KafkaPathResolverMixin
-from kafkatest.services.monitor.jmx import JmxMixin
from kafkatest.services.kafka import KafkaConfig
+from kafkatest.services.monitor.jmx import JmxMixin
from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1
+STATE_DIR = "state.dir"
class StreamsTestBaseService(KafkaPathResolverMixin, JmxMixin, Service):
"""Base class for Streams Test services providing some common settings and
functionality"""
@@ -308,7 +307,6 @@ class
StreamsSmokeTestDriverService(StreamsSmokeTestBaseService):
def start_cmd(self, node):
args = self.args.copy()
- args['kafka'] = self.kafka.bootstrap_servers()
args['config_file'] = self.CONFIG_FILE
args['stdout'] = self.STDOUT_FILE
args['stderr'] = self.STDERR_FILE
@@ -319,7 +317,7 @@ class
StreamsSmokeTestDriverService(StreamsSmokeTestBaseService):
cmd = "( export
KAFKA_LOG4J_OPTS=\"-Dlog4j.configuration=file:%(log4j)s\"; " \
"INCLUDE_TEST_JARS=true %(kafka_run_class)s
%(streams_class_name)s " \
- " %(kafka)s %(config_file)s %(user_test_args)s
%(disable_auto_terminate)s" \
+ " %(config_file)s %(user_test_args1)s
%(disable_auto_terminate)s" \
" & echo $! >&3 ) 1>> %(stdout)s 2>> %(stderr)s 3> %(pidfile)s"
% args
return cmd
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py
b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index 8b7d771..debe85f 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -13,15 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from ducktape.mark import ignore, matrix, parametrize
+import random
+import time
+from ducktape.mark import ignore, matrix
from ducktape.mark.resource import cluster
from ducktape.tests.test import Test
from kafkatest.services.kafka import KafkaService
from kafkatest.services.streams import StreamsSmokeTestDriverService,
StreamsSmokeTestJobRunnerService, StreamsUpgradeTestJobRunnerService
from kafkatest.services.zookeeper import ZookeeperService
from kafkatest.version import LATEST_0_10_0, LATEST_0_10_1, LATEST_0_10_2,
LATEST_0_11_0, LATEST_1_0, LATEST_1_1, DEV_BRANCH, DEV_VERSION, KafkaVersion
-import random
-import time
# broker 0.10.0 is not compatible with newer Kafka Streams versions
broker_upgrade_versions = [str(LATEST_0_10_1), str(LATEST_0_10_2),
str(LATEST_0_11_0), str(LATEST_1_0), str(LATEST_1_1), str(DEV_BRANCH)]
@@ -56,6 +56,7 @@ class StreamsUpgradeTest(Test):
node.version = KafkaVersion(to_version)
self.kafka.start_node(node)
+ @ignore
@cluster(num_nodes=6)
@matrix(from_version=broker_upgrade_versions,
to_version=broker_upgrade_versions)
def test_upgrade_downgrade_brokers(self, from_version, to_version):
@@ -123,6 +124,7 @@ class StreamsUpgradeTest(Test):
node.account.ssh("grep ALL-RECORDS-DELIVERED %s" %
self.driver.STDOUT_FILE, allow_fail=False)
self.processor1.node.account.ssh_capture("grep
SMOKE-TEST-CLIENT-CLOSED %s" % self.processor1.STDOUT_FILE, allow_fail=False)
+ @ignore
@matrix(from_version=metadata_2_versions, to_version=metadata_2_versions)
def test_simple_upgrade_downgrade(self, from_version, to_version):
"""
@@ -175,6 +177,7 @@ class StreamsUpgradeTest(Test):
self.driver.stop()
#@matrix(from_version=metadata_1_versions,
to_version=backward_compatible_metadata_2_versions)
+ @ignore
@matrix(from_version=metadata_1_versions, to_version=metadata_3_versions)
@matrix(from_version=metadata_2_versions, to_version=metadata_3_versions)
def test_metadata_upgrade(self, from_version, to_version):
--
To stop receiving notification emails like this one, please contact
[email protected].
