Repository: kafka Updated Branches: refs/heads/trunk 44723caec -> f1b37eec7
HOTFIX: Adding init file so streams benchmark is autodiscovered Without this file the benchmark does not run nightly. Author: Eno Thereska <[email protected]> Reviewers: Geoff Anderson <[email protected]>, Ismael Juma <[email protected]> Closes #1645 from enothereska/hotfix-streams-test Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/f1b37eec Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/f1b37eec Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/f1b37eec Branch: refs/heads/trunk Commit: f1b37eec7422fde2e9240ff56b031b6958887176 Parents: 44723ca Author: Eno Thereska <[email protected]> Authored: Fri Jul 22 00:18:48 2016 +0100 Committer: Ismael Juma <[email protected]> Committed: Fri Jul 22 00:18:48 2016 +0100 ---------------------------------------------------------------------- tests/kafkatest/benchmarks/streams/__init__.py | 15 +++++++++++++++ .../services/performance/streams_performance.py | 11 ++--------- tests/kafkatest/tests/streams/__init__.py | 1 - 3 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/f1b37eec/tests/kafkatest/benchmarks/streams/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/benchmarks/streams/__init__.py b/tests/kafkatest/benchmarks/streams/__init__.py new file mode 100644 index 0000000..ebc9bb3 --- /dev/null +++ b/tests/kafkatest/benchmarks/streams/__init__.py @@ -0,0 +1,15 @@ +# 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. +# see kafka.server.KafkaConfig for additional details and defaults http://git-wip-us.apache.org/repos/asf/kafka/blob/f1b37eec/tests/kafkatest/services/performance/streams_performance.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/services/performance/streams_performance.py b/tests/kafkatest/services/performance/streams_performance.py index 8002bbe..289bccb 100644 --- a/tests/kafkatest/services/performance/streams_performance.py +++ b/tests/kafkatest/services/performance/streams_performance.py @@ -118,15 +118,8 @@ class StreamsSimpleBenchmarkService(KafkaPathResolverMixin, Service): def collect_data(self, node): # Collect the data and return it to the framework output = node.account.ssh_capture("grep Performance %s" % self.STDOUT_FILE) - data = [] - data.append('{') + data = {} for line in output: parts = line.split(':') - data.append('\'') - data.append(parts[0]) - data.append('\'') - data.append(':') - data.append(parts[1]); - data.append('}') - data = ''.join(data) + data[parts[0]] = float(parts[1]) return data http://git-wip-us.apache.org/repos/asf/kafka/blob/f1b37eec/tests/kafkatest/tests/streams/__init__.py ---------------------------------------------------------------------- diff --git a/tests/kafkatest/tests/streams/__init__.py b/tests/kafkatest/tests/streams/__init__.py index ebc9bb3..ec20143 100644 --- a/tests/kafkatest/tests/streams/__init__.py +++ b/tests/kafkatest/tests/streams/__init__.py @@ -12,4 +12,3 @@ # 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. -# see kafka.server.KafkaConfig for additional details and defaults
