Repository: kafka Updated Branches: refs/heads/trunk 80d78f814 -> de0624433
MINOR: remove streams-smoke-test.sh guozhangwang Author: Yasuhiro Matsuda <[email protected]> Reviewers: Guozhang Wang <[email protected]> Closes #1125 from ymatsuda/remove_smoketest_shell_script Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/de062443 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/de062443 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/de062443 Branch: refs/heads/trunk Commit: de062443381df84ee0d65acc20e44ffca2b2552b Parents: 80d78f8 Author: Yasuhiro Matsuda <[email protected]> Authored: Wed Mar 23 14:57:03 2016 -0700 Committer: Guozhang Wang <[email protected]> Committed: Wed Mar 23 14:57:03 2016 -0700 ---------------------------------------------------------------------- bin/streams-smoke-test.sh | 23 ----------------------- tests/kafkatest/services/streams.py | 3 ++- 2 files changed, 2 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/de062443/bin/streams-smoke-test.sh ---------------------------------------------------------------------- diff --git a/bin/streams-smoke-test.sh b/bin/streams-smoke-test.sh deleted file mode 100755 index 196990e..0000000 --- a/bin/streams-smoke-test.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# 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. - -base_dir=$(dirname $0) - -if [ "x$KAFKA_LOG4J_OPTS" = "x" ]; then - export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:$base_dir/../config/tools-log4j.properties" -fi - -exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.streams.smoketest.StreamsSmokeTest "$@" http://git-wip-us.apache.org/repos/asf/kafka/blob/de062443/tests/kafkatest/services/streams.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/streams.py b/tests/kafkatest/services/streams.py index 192a8d9..dcbcc69 100644 --- a/tests/kafkatest/services/streams.py +++ b/tests/kafkatest/services/streams.py @@ -107,7 +107,8 @@ class StreamsSmokeTestBaseService(Service): args['kafka_dir'] = kafka_dir(node) cmd = "( export KAFKA_LOG4J_OPTS=\"-Dlog4j.configuration=file:%(log4j)s\"; " \ - "/opt/%(kafka_dir)s/bin/streams-smoke-test.sh %(command)s %(kafka)s %(zk)s %(state_dir)s " \ + "/opt/%(kafka_dir)s/bin/kafka-run-class.sh org.apache.kafka.streams.smoketest.StreamsSmokeTest " \ + " %(command)s %(kafka)s %(zk)s %(state_dir)s " \ " & echo $! >&3 ) 1>> %(stdout)s 2>> %(stderr)s 3> %(pidfile)s" % args return cmd
