openstack/rally
Code Issues Proposed changes

Merge "[report] Fix the dummy mismatch in report.mako"

Browse Source
This commit is contained in:
Jenkins 2015-11-23 14:07:58 +00:00 committed by Gerrit Code Review
commit 8b14eea91d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rally/task/processing/plot.py
View File

@ -90,7 +90,8 @@ def _process_tasks(tasks_results):
tasks.append(_process_scenario(scenario, position[name]))
source = json.dumps(source_dict, indent=2, sort_keys=True)
return source, sorted(tasks, key=lambda r: r["cls"] + r["name"])
return source, sorted(tasks, key=lambda r: (r["cls"], r["met"],
int(r["pos"])))
def plot(tasks_results):

13
tests/unit/task/processing/test_plot.py
View File

@ -77,16 +77,21 @@ class PlotTestCase(test.TestCase):
tasks_results = [{"key": {"name": i, "kw": "kw_" + i}}
for i in ("a", "b", "c", "b")]
mock__process_scenario.side_effect = lambda a, b: (
{"cls": "%s_cls" % a["key"]["name"], "name": str(b)})
{"cls": "%s_cls" % a["key"]["name"],
"name": str(b),
"met": "dummy",
"pos": str(b)})
source, tasks = plot._process_tasks(tasks_results)
self.assertEqual(source, "json_data")
mock_json_dumps.assert_called_once_with(
{"a": ["kw_a"], "b": ["kw_b", "kw_b"], "c": ["kw_c"]},
sort_keys=True, indent=2)
self.assertEqual(
sorted(tasks, key=lambda x: x["cls"] + x["name"]),
[{"cls": "a_cls", "name": "0"}, {"cls": "b_cls", "name": "0"},
{"cls": "b_cls", "name": "1"}, {"cls": "c_cls", "name": "0"}])
tasks,
[{"cls": "a_cls", "met": "dummy", "name": "0", "pos": "0"},
{"cls": "b_cls", "met": "dummy", "name": "0", "pos": "0"},
{"cls": "b_cls", "met": "dummy", "name": "1", "pos": "1"},
{"cls": "c_cls", "met": "dummy", "name": "0", "pos": "0"}])
@mock.patch(PLOT + "_process_tasks")
@mock.patch(PLOT + "objects")