Merge ~ltrager/maas:lp1757153 into maas:master

[Lee Trager]

LP: #1757153 - Fix script runtime while running.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Newell Jensen (newell-jensen)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1757153 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 6a20dd51d7123fad6cf01ac2243648c0b901ef4a

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 f5ee0b4..66c053e 100644
--- a/src/maasserver/static/js/angular/directives/script_runtime.js
+++ b/src/maasserver/static/js/angular/directives/script_runtime.js
@@ -1,4 +1,4 @@
-/* Copyright 2017 Canonical Ltd.  This software is licensed under the
+/* Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * Script runtime counter directive.
@@ -36,9 +36,8 @@ angular.module('MAAS').directive('maasScriptRunTime', function() {
             function incrementCounter() {
                 if(($scope.scriptStatus === 1 || $scope.scriptStatus === 7) &&
                     $scope.startTime) {
-                    var start_date = new Date(null);
-                    start_date.setSeconds($scope.startTime);
-                    var seconds = Math.floor((Date.now() - start_date) / 1000);
+                    var seconds = Math.floor(
+                        (Date.now() / 1000) - $scope.startTime);
                     var minutes = Math.floor(seconds / 60);
                     var hours = Math.floor(minutes / 60);
                     var days = Math.floor(hours / 24);
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 f26fb53..b5048fe 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
@@ -1,4 +1,4 @@
-/* Copyright 2017 Canonical Ltd.  This software is licensed under the
+/* Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
  * Unit tests for script runtime directive.
@@ -111,4 +111,17 @@ describe("maasScriptRunTime", function() {
         expect(spanElement.text()).toEqual(
             '2 days, 0:00:00 of ~' + estimatedRunTime);
     });
+
+    it('regression test for LP:1757153', function() {
+        var startTime = (Date.now() / 1000) - 1;
+        var estimatedRunTime = '0:00:54';
+        var scriptStatus = 1;
+        var directive = compileDirective(
+            startTime, null, estimatedRunTime, scriptStatus);
+        // Flush should not cause the passed time to change.
+        var spanElement = directive.find('span');
+        expect(spanElement).toBeDefined();
+        expect(spanElement.text()).toEqual(
+            '0:00:01 of ~' + estimatedRunTime);
+    });
 });