Merge "Fix trend reports"

This commit is contained in:
Zuul 2017-10-17 11:29:41 +00:00 committed by Gerrit Code Review
commit b0532ef454

View File

@ -363,8 +363,6 @@ class TaskTestCase(unittest.TestCase):
self.assertTrue(os.path.exists(html_report)) self.assertTrue(os.path.exists(html_report))
self._assert_html_report_libs_are_embedded(html_report) self._assert_html_report_libs_are_embedded(html_report)
@unittest.skip("It started failing due to broken launching script. "
"Requires investigation.")
def test_trends(self): def test_trends(self):
cfg1 = { cfg1 = {
"Dummy.dummy": [ "Dummy.dummy": [
@ -412,12 +410,13 @@ class TaskTestCase(unittest.TestCase):
report = rally.gen_report_path(extension="html") report = rally.gen_report_path(extension="html")
for i in range(5): for i in range(5):
rally("task start --task %(file)s --tag trends_run_%(idx)d" rally("task start --task %(file)s --tag trends_run "
% {"file": config1.filename, "idx": i}) "run_%(idx)d" % {"file": config1.filename, "idx": i})
rally("task start --task %s --tag trends_run_once" % config2.filename) rally("task start --task %s --tag trends_run run_once" %
config2.filename)
tasks_list = rally("task list") tasks_list = rally("task list --uuids-only --tag trends_run")
uuids = [u[2:38] for u in tasks_list.split("\n") if "trends_run" in u] uuids = [u for u in tasks_list.split("\n") if u]
rally("task trends %(uuids)s --out %(report)s" rally("task trends %(uuids)s --out %(report)s"
% {"uuids": " ".join(uuids), "report": report}) % {"uuids": " ".join(uuids), "report": report})