Reporting fixes for culling unpacked tar balls

Author: portante

server/bin/gold/test-27.txt

@@ -20,9 +20,9 @@ len(actions) = 1
             "chunk_id": 1,
             "doctype": "status",
             "name": "pbench-cull-unpacked-tarballs",
-            "text": "Culled 3 unpacked tar ball directories (0 errors) in 0.00 secs\n\nActions Taken:\n  - controller-no-prefixes/tarball_culled_1970.01.01T00.00.00 (0 errors, {act_set.duration():0.2f} secs)\n      $ rm results/controller-no-prefixes/tarball_culled_1970.01.01T00.00.00  # succ\n      $ mv incoming/controller-no-prefixes/tarball_culled_1970.01.01T00.00.00 incoming/controller-no-prefixes/.delete.tarball_culled_1970.01.01T00.00.00  # succ\n      $ rmtree incoming/controller-no-prefixes/.delete.tarball_culled_1970.01.01T00.00.00  # succ\n  - controller-prefixes/tarball_culled-w-prefix_1970.01.01T00.00.00 (0 errors, {act_set.duration():0.2f} secs)\n      $ rm results/controller-prefixes/pre0/pre1/pre2/tarball_culled-w-prefix_1970.01.01T00.00.00  # succ\n      $ mv incoming/controller-prefixes/tarball_culled-w-prefix_1970.01.01T00.00.00 incoming/controller-prefixes/.delete.tarball_culled-w-prefix_1970.01.01T00.00.00  # succ\n      $ rmtree incoming/controller-prefixes/.delete.tarball_culled-w-prefix_1970.01.01T00.00.00  # succ\n  - controller-prefixes/tarball_culled-w-userA_1970.01.01T00.00.00 (0 errors, {act_set.duration():0.2f} secs)\n      $ rm results/controller-prefixes/path0/path1/tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n      $ rm users/userA/controller-prefixes/path0/path1/tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n      $ mv incoming/controller-prefixes/tarball_culled-w-userA_1970.01.01T00.00.00 incoming/controller-prefixes/.delete.tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n      $ rmtree incoming/controller-prefixes/.delete.tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n",
+            "text": "Culled 3 unpacked tar ball directories (0 errors) in 0.00 secs\n\nActions Taken:\n  - controller-no-prefixes/tarball_culled_1970.01.01T00.00.00 (0 errors, 0.00 secs)\n      $ rm results/controller-no-prefixes/tarball_culled_1970.01.01T00.00.00  # succ\n      $ mv incoming/controller-no-prefixes/tarball_culled_1970.01.01T00.00.00 incoming/controller-no-prefixes/.delete.tarball_culled_1970.01.01T00.00.00  # succ\n      $ rmtree incoming/controller-no-prefixes/.delete.tarball_culled_1970.01.01T00.00.00  # succ\n  - controller-prefixes/tarball_culled-w-prefix_1970.01.01T00.00.00 (0 errors, 0.00 secs)\n      $ rm results/controller-prefixes/pre0/pre1/pre2/tarball_culled-w-prefix_1970.01.01T00.00.00  # succ\n      $ mv incoming/controller-prefixes/tarball_culled-w-prefix_1970.01.01T00.00.00 incoming/controller-prefixes/.delete.tarball_culled-w-prefix_1970.01.01T00.00.00  # succ\n      $ rmtree incoming/controller-prefixes/.delete.tarball_culled-w-prefix_1970.01.01T00.00.00  # succ\n  - controller-prefixes/tarball_culled-w-userA_1970.01.01T00.00.00 (0 errors, 0.00 secs)\n      $ rm results/controller-prefixes/path0/path1/tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n      $ rm users/userA/controller-prefixes/path0/path1/tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n      $ mv incoming/controller-prefixes/tarball_culled-w-userA_1970.01.01T00.00.00 incoming/controller-prefixes/.delete.tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n      $ rmtree incoming/controller-prefixes/.delete.tarball_culled-w-userA_1970.01.01T00.00.00  # succ\n",
             "total_chunks": 1,
-            "total_size": 1614
+            "total_size": 1551
         },
         "_type": "pbench-server-reports"
     }

server/bin/pbench-cull-unpacked-tarballs.py

@@ -79,6 +79,9 @@ def __init__(self, actions, errors, start, end):
     def set_name(self, name):
         self.name = name
 
+    def duration(self):
+        return self.end - self.start
+
 
 def fetch_username(tb_incoming_dir):
     """fetch_username - Return the pbench "run"'s "user" value from the
@@ -239,7 +242,7 @@ def remove_unpacked(tb_incoming_dir, controller_name, results, users, logger, dr
     end = pbench._time()
     act_set = ActionSet(actions_taken, errors, start, end)
     if errors == 0:
-        duration = 0.0 if start < end else start - end
+        duration = 0.0 if end < start else end - start
         logger.info(
             "After {:0.2f} seconds, finished removal of unpacked tar ball"
             " directory, '{}'",
@@ -457,7 +460,7 @@ def main(options):
         for act_set in actions_taken:
             print(
                 f"  - {act_set.name} ({act_set.errors:d} errors,"
-                " {act_set.duration():0.2f} secs)",
+                f" {act_set.duration():0.2f} secs)",
                 file=tfp,
             )
             for act in act_set.actions: