Merge ~ltrager/maas:lp1733015 into maas:master

[Lee Trager]

LP: #1733015 - Show days in runtime when tests run over 24 hours

[Mike Pontillo (mpontillo)]

I'm +1 on this branch since it makes things correct and consistent.

But I think the final rendered string is a bit large. We might consider cutting out the days and just use the number of hours, to be more concise. Example:

https://usercontent.irccloud-cdn.com/file/ESWpb82l/getting-a-bit-too-big.png

review: Approve

diff --git a/src/maasserver/static/js/angular/directives/script_runtime.js b/src/maasserver/static/js/angular/directives/script_runtime.js
index 3a198c3..f5ee0b4 100644
--- a/src/maasserver/static/js/angular/directives/script_runtime.js
+++ b/src/maasserver/static/js/angular/directives/script_runtime.js
@@ -36,12 +36,38 @@ angular.module('MAAS').directive('maasScriptRunTime', function() {
             function incrementCounter() {
                 if(($scope.scriptStatus === 1 || $scope.scriptStatus === 7) &&
                     $scope.startTime) {
-                    var date = new Date(null);
-                    date.setSeconds((Date.now()/1000) - $scope.startTime);
-                    $scope.counter = date.toISOString().substr(11, 8);
-                    if($scope.counter.indexOf('00:') === 0) {
-                      $scope.counter = $scope.counter.substr(1);
+                    var start_date = new Date(null);
+                    start_date.setSeconds($scope.startTime);
+                    var seconds = Math.floor((Date.now() - start_date) / 1000);
+                    var minutes = Math.floor(seconds / 60);
+                    var hours = Math.floor(minutes / 60);
+                    var days = Math.floor(hours / 24);
+                    hours = hours - (days * 24);
+                    minutes = minutes - (days * 24 * 60) - (hours * 60);
+                    seconds = seconds - (days * 24 * 60 * 60) -
+                        (hours * 60 * 60) - (minutes * 60);
+                    var new_counter = "";
+                    // This outputs the same format used by Python. It is
+                    // import to use the same format as when scripts are not
+                    // running runtime is taken from the region using Python's
+                    // format.
+                    if(days === 1) {
+                        new_counter = days + " day, ";
+                    }else if(days > 1) {
+                        new_counter = days + " days, ";
                     }
+                    new_counter += hours + ":";
+                    if(minutes < 10) {
+                        new_counter += "0" + minutes + ":";
+                    } else {
+                        new_counter += minutes + ":";
+                    }
+                    if(seconds < 10) {
+                        new_counter += "0" + seconds;
+                    } else {
+                        new_counter += seconds;
+                    }
+                    $scope.counter = new_counter;
                 }
             }
 
diff --git a/src/maasserver/static/js/angular/directives/tests/test_script_runtime.js b/src/maasserver/static/js/angular/directives/tests/test_script_runtime.js
index 5839f3f..f5343ca 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_script_runtime.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_script_runtime.js
@@ -86,4 +86,19 @@ describe("maasScriptRunTime", function() {
         expect(spanElement).toBeDefined();
         expect(spanElement.text()).toEqual('0:00:05 of ~' + estimatedRunTime);
     });
+
+    it('shows day when over 24 hours', function() {
+        // Regression test for LP:1733015
+        var startTime = (Date.now() / 1000) - (2 * 24 * 60 * 60); // 2 days ago
+        var estimatedRunTime = '1 day, 0:00:35';
+        var scriptStatus = 1;
+        var directive = compileDirective(
+            startTime, null, estimatedRunTime, scriptStatus);
+        // Flush should not cause the passed time to change.
+        $interval.flush(1000);
+        var spanElement = directive.find('span');
+        expect(spanElement).toBeDefined();
+        expect(spanElement.text()).toEqual(
+            '2 days, 0:00:00 of ~' + estimatedRunTime);
+    });
 });