x/browbeat
Code Issues Proposed changes

Merge "Handle case where benchmark list is empty"

Browse Source
This commit is contained in:
Jenkins 2016-07-22 17:46:18 +00:00 committed by Gerrit Code Review
commit 9ef970a3e2
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PerfKit.py
View File

@ -158,7 +158,7 @@ class PerfKit(WorkloadBase):
time_stamp = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
self.logger.debug("Time Stamp (Prefix): {}".format(time_stamp))
benchmarks = self.config.get('perfkit')['benchmarks']
if len(benchmarks) > 0:
if (benchmarks is not None and len(benchmarks) > 0):
for benchmark in benchmarks:
if benchmark['enabled']:
self.logger.info("Benchmark: {}".format(benchmark['name']))

2
lib/Rally.py
View File

@ -179,7 +179,7 @@ class Rally(WorkloadBase):
dir_ts = es_ts.strftime("%Y%m%d-%H%M%S")
self.logger.debug("Time Stamp (Prefix): {}".format(dir_ts))
benchmarks = self.config.get('rally')['benchmarks']
if len(benchmarks) > 0:
if (benchmarks is not None and len(benchmarks) > 0):
for benchmark in benchmarks:
if benchmark['enabled']:
self.logger.info("Benchmark: {}".format(benchmark['name']))

3
lib/Shaker.py
View File

@ -397,8 +397,7 @@ class Shaker(WorkloadBase):
scenarios = self.config.get('shaker')['scenarios']
venv = self.config['shaker']['venv']
self.shaker_checks()
scen_length = len(scenarios)
if scen_length > 0:
if (scenarios is not None and len(scenarios) > 0):
for scenario in scenarios:
if scenario['enabled']:
self.update_scenarios()