removing humanize.naturaldelta() for task output duration, to ensure long-running tasks no longer output "an hour" when they actually run longer then an hour. This should prevent requests to increase timeouts past 1hr, which has already been done.

Signed-off-by: Adam D. Cornett <adc@redhat.com>

Author: acornett21

operatorcert/tekton.py

@@ -4,7 +4,6 @@
 import json
 from typing import Any, Dict
 
-import humanize
 from dateutil.parser import isoparse
 
 
@@ -50,14 +49,20 @@ def completion_time(self) -> datetime.datetime:
         return isoparse(self.obj["status"]["completionTime"])
 
     @property
-    def duration(self) -> Any:
+    def duration(self) -> str:
         """
         Get the duration of the TaskRun.
 
         Returns:
-            Any: A human readable duration of the TaskRun
-        """
-        return humanize.naturaldelta(self.completion_time - self.start_time)
+            str: A human readable duration of the TaskRun.
+        """
+        # Avoid humanize.naturaldelta() which rounds e.g. 67 min to "an hour"
+        delta = self.completion_time - self.start_time
+        total_seconds = int(delta.total_seconds())
+        if total_seconds >= 60:
+            minutes = round(total_seconds / 60)
+            return f"{minutes} minute{'s' if minutes != 1 else ''}"
+        return f"{total_seconds} second{'s' if total_seconds != 1 else ''}"
 
     @property
     def status(self) -> str:

tests/data/pipelinerun_long.json

@@ -0,0 +1,19 @@
+{
+  "apiVersion": "tekton.dev/v1",
+  "kind": "PipelineRun",
+  "metadata": {
+    "name": "long-running-pipeline-run",
+    "labels": {
+      "tekton.dev/pipeline": "test-pipeline"
+    }
+  },
+  "status": {
+    "startTime": "2021-11-10T18:00:00Z",
+    "pipelineSpec": {
+      "tasks": [
+        {"name": "build-fbc-index-images"}
+      ],
+      "finally": []
+    }
+  }
+}

tests/data/taskruns_long.json

@@ -0,0 +1,21 @@
+[
+  {
+    "apiVersion": "tekton.dev/v1",
+    "kind": "TaskRun",
+    "metadata": {
+      "labels": {
+        "tekton.dev/pipelineTask": "build-fbc-index-images"
+      }
+    },
+    "status": {
+      "startTime": "2021-11-10T18:00:00Z",
+      "completionTime": "2021-11-10T19:07:12Z",
+      "conditions": [
+        {
+          "type": "Succeeded",
+          "reason": "Succeeded"
+        }
+      ]
+    }
+  }
+]

tests/test_tekton.py

@@ -6,6 +6,8 @@
 PARENT_DIR = pathlib.Path(__file__).parent.resolve()
 PIPELINERUN_PATH = PARENT_DIR.joinpath("data/pipelinerun.json")
 TASKRUNS_PATH = PARENT_DIR.joinpath("data/taskruns.json")
+PIPELINERUN_LONG_PATH = PARENT_DIR.joinpath("data/pipelinerun_long.json")
+TASKRUNS_LONG_PATH = PARENT_DIR.joinpath("data/taskruns_long.json")
 
 
 def test_taskrun() -> None:
@@ -32,6 +34,17 @@ def test_taskrun() -> None:
     assert tr.status == TaskRun.FAILED
 
 
+def test_taskrun_long_duration() -> None:
+    pr = PipelineRun.from_files(str(PIPELINERUN_LONG_PATH), str(TASKRUNS_LONG_PATH))
+
+    tr = pr.taskruns[0]
+    assert tr.pipelinetask == "build-fbc-index-images"
+    assert str(tr.start_time) == "2021-11-10 18:00:00+00:00"
+    assert str(tr.completion_time) == "2021-11-10 19:07:12+00:00"
+    assert tr.duration == "67 minutes"
+    assert tr.status == TaskRun.SUCCEEDED
+
+
 def test_pipelinerun() -> None:
     pr = PipelineRun.from_files(str(PIPELINERUN_PATH), str(TASKRUNS_PATH))