aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-03-05 17:49:32 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-05 17:49:32 +0000
commitd9a19da691a0cc258d26a2967983396b1c034b65 (patch)
tree7b43a5eccad8587ab2c46603f6ac297af25c804e
parent8400c1895c49cb0c7802692f75d820fb5b8b7dc4 (diff)
parent94abcc7d80aa8e13a7c77b99483f08bee7c20fb2 (diff)
Merge "Fix report generation"
-rw-r--r--yardstick/benchmark/core/report.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/yardstick/benchmark/core/report.py b/yardstick/benchmark/core/report.py
index 997a125e7..199602444 100644
--- a/yardstick/benchmark/core/report.py
+++ b/yardstick/benchmark/core/report.py
@@ -45,7 +45,7 @@ class Report(object):
self.task_id = ""
def _validate(self, yaml_name, task_id):
- if re.match("^[a-z0-9_-]+$", yaml_name):
+ if re.match(r"^[\w-]+$", yaml_name):
self.yaml_name = yaml_name
else:
raise ValueError("invalid yaml_name", yaml_name)
@@ -102,10 +102,12 @@ class Report(object):
task_time = str(task_time, 'utf8')
key = str(key, 'utf8')
task_time = task_time[11:]
- head, sep, tail = task_time.partition('.')
+ head, _, tail = task_time.partition('.')
task_time = head + "." + tail[:6]
self.Timestamp.append(task_time)
- if isinstance(task[key], float) is True:
+ if task[key] is None:
+ values.append('')
+ elif isinstance(task[key], (int, float)) is True:
values.append(task[key])
else:
values.append(ast.literal_eval(task[key]))