Merge "Fix rally task detailed --iterations-data"

rally/cmd/commands/task.py

@@ -283,16 +283,11 @@ class TaskCommands(object):
                                    for col in float_cols]))
             for (c, r) in enumerate(raw_data, 1):
                 dlist = [c]
+                dlist.append(r["duration"])
                 if r["atomic_actions"]:
-                    dlist.append(r["duration"])
                     for action in atomic_actions:
                         dlist.append(r["atomic_actions"].get(action) or 0)
-                    table_rows.append(rutils.Struct(**dict(zip(headers,
+                table_rows.append(rutils.Struct(**dict(zip(headers, dlist))))
-                                                               dlist))))
-                else:
-                    data = dlist + [None for i in range(1, len(headers))]
-                    table_rows.append(rutils.Struct(**dict(zip(headers,
-                                                               data))))
             common_cliutils.print_list(table_rows,
                                        fields=headers,
                                        formatters=formatters)

tests/functional/test_cli_task.py

@@ -64,6 +64,27 @@ class TaskTestCase(unittest.TestCase):
         self.assertIn("dummy_fail_test (2)", detailed)
         detailed_iterations_data = rally("task detailed --iterations-data")
         self.assertIn("2. dummy_fail_test (2)", detailed_iterations_data)
+        self.assertNotIn("n/a", detailed_iterations_data)
+
+    def test_detailed_no_atomic_actions(self):
+        rally = utils.Rally()
+        cfg = {
+            "Dummy.dummy": [
+                {
+                    "runner": {
+                        "type": "constant",
+                        "times": 100,
+                        "concurrency": 5
+                    }
+                }
+            ]
+        }
+        config = utils.TaskConfig(cfg)
+        rally("task start --task %s" % config.filename)
+        detailed = rally("task detailed")
+        self.assertIn("Dummy.dummy", detailed)
+        detailed_iterations_data = rally("task detailed --iterations-data")
+        self.assertNotIn("n/a", detailed_iterations_data)
 
     def test_results(self):
         rally = utils.Rally()