Merge ~blake-rouse/maas:lp1723425 into maas:master

[Blake Rouse]

Fixes LP: #1723425 - Add a maas-script-runtime-directive to render client side the current runtime of a script.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1723425 lp:~blake-rouse/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/662/console
COMMIT: a55e2f46eeba4ca6db6548ec1ada82526f2e9186

review: Needs Fixing

[Mike Pontillo (mpontillo)]

New code looks good. (Of course, I trust you to fix the regressions in the test suite noted by the lander!)

review: Approve

[Lee Trager (ltrager)]

LGTM!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1723425 lp:~blake-rouse/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/670/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1723425 lp:~blake-rouse/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 6351fe88d73b42a1fb9abe2f87c7ef8cad463c19

review: Approve

diff --git a/src/maasserver/api/scriptresults.py b/src/maasserver/api/scriptresults.py
index 80fc7f3..b11ba66 100644
--- a/src/maasserver/api/scriptresults.py
+++ b/src/maasserver/api/scriptresults.py
@@ -210,6 +210,9 @@ class NodeScriptResultHandler(OperationsHandler):
                 'started': fmt_time(script_result.started),
                 'ended': fmt_time(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
                 'parameters': script_result.parameters,
                 'script_id': script_result.script_id,
                 'script_revision_id': script_result.script_version_id,
diff --git a/src/maasserver/api/tests/test_scriptresults.py b/src/maasserver/api/tests/test_scriptresults.py
index d80b68f..ee942a9 100644
--- a/src/maasserver/api/tests/test_scriptresults.py
+++ b/src/maasserver/api/tests/test_scriptresults.py
@@ -269,6 +269,9 @@ class TestNodeScriptResultAPI(APITestCase.ForUser):
                 'started': fmt_time(script_result.started),
                 'ended': fmt_time(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
                 'parameters': script_result.parameters,
                 'script_id': script_result.script_id,
                 'script_revision_id': script_result.script_version_id,
@@ -315,6 +318,9 @@ class TestNodeScriptResultAPI(APITestCase.ForUser):
                 'started': fmt_time(script_result.started),
                 'ended': fmt_time(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
                 'parameters': script_result.parameters,
                 'script_id': script_result.script_id,
                 'script_revision_id': script_result.script_version_id,
@@ -378,6 +384,9 @@ class TestNodeScriptResultAPI(APITestCase.ForUser):
                 'started': fmt_time(script_result.started),
                 'ended': fmt_time(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
                 'parameters': script_result.parameters,
                 'script_id': script_result.script_id,
                 'script_revision_id': script_result.script_version_id,
diff --git a/src/maasserver/static/js/angular/directives/script_runtime.js b/src/maasserver/static/js/angular/directives/script_runtime.js
 new file mode 100644
index 0000000..3a198c3
--- /dev/null
+++ b/src/maasserver/static/js/angular/directives/script_runtime.js
@@ -0,0 +1,57 @@
+/* Copyright 2017 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * Script runtime counter directive.
+ */
+
+angular.module('MAAS').run(['$templateCache', function ($templateCache) {
+    // Inject the script_runtime.html into the template cache.
+    $templateCache.put('directive/templates/script_runtime.html', [
+        '<span data-ng-if="(scriptStatus === 1 || scriptStatus === 7) &&',
+        " estimatedRunTime !== 'Unknown'" + '">{{counter}} of ',
+        '~{{estimatedRunTime}}</span>',
+        '<span data-ng-if="(scriptStatus === 1 || scriptStatus === 7) &&',
+        " estimatedRunTime == 'Unknown'" + '">{{counter}}</span>',
+        '<span data-ng-if="scriptStatus === 0 && estimatedRunTime !== ',
+        "'Unknown'" + '">~{{estimatedRunTime}}</span>',
+        '<span data-ng-if="scriptStatus !== 0 && scriptStatus !== 1 ',
+        '&& scriptStatus !== 7">{{runTime}}</span>'
+    ].join(''));
+}]);
+
+angular.module('MAAS').directive('maasScriptRunTime', function() {
+    return {
+        restrict: "A",
+        require: ["startTime", "runTime", "estimatedRunTime", "scriptStatus"],
+        scope: {
+            startTime: '=',
+            runTime: '@',
+            estimatedRunTime: '@',
+            scriptStatus: '='
+        },
+        templateUrl: 'directive/templates/script_runtime.html',
+        controller: function($scope, $interval) {
+            $scope.counter = "0:00:00";
+
+            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);
+                    }
+                }
+            }
+
+            // Update the counter on init, start the interval and stop it when
+            // the directive is destroyed.
+            incrementCounter();
+            var promise = $interval(incrementCounter, 1000);
+            $scope.$on('$destroy', function() {
+              $interval.cancel(promise);
+            });
+        }
+    };
+});
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
 new file mode 100644
index 0000000..5839f3f
--- /dev/null
+++ b/src/maasserver/static/js/angular/directives/tests/test_script_runtime.js
@@ -0,0 +1,89 @@
+/* Copyright 2017 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.
+ */
+
+describe("maasScriptRunTime", function() {
+
+    // Load the MAAS module.
+    beforeEach(module("MAAS"));
+
+    // Create a new scope before each test.
+    var $scope, $interval;
+    beforeEach(inject(function($rootScope, $injector) {
+        $interval = $injector.get('$interval');
+        $scope = $rootScope.$new();
+        $scope.startTime = null;
+        $scope.runTime = null;
+        $scope.estimatedRunTime = null;
+        $scope.scriptStatus = null;
+    }));
+
+    // Return the compiled directive.
+    function compileDirective(
+        startTime, runTime, estimatedRunTime, scriptStatus) {
+        var directive;
+        var html = '<span data-maas-script-run-time="script-runtime" ' +
+            'data-start-time="' + startTime + '" data-run-time="' +
+            runTime + '" data-estimated-run-time="' + estimatedRunTime +
+            '" data-script-status="' + scriptStatus + '"></span>';
+
+        // Compile the directive.
+        inject(function($compile) {
+            directive = $compile(html)($scope);
+        });
+
+        // Perform the digest cycle to finish the compile.
+        $scope.$digest();
+        return directive;
+    }
+
+    it('should have span element', function () {
+        var startTime = Date.now() / 1000;
+        var runTime = '0:00:30';
+        var estimatedRunTime = '0:00:35';
+        var scriptStatus = 7;
+        var directive = compileDirective(
+            startTime, runTime, estimatedRunTime, scriptStatus);
+        var spanElement = directive.find('span');
+        expect(spanElement).toBeDefined();
+        expect(spanElement.text()).toEqual('0:00:00 of ~' + estimatedRunTime);
+    });
+
+    it('should have applied template', function () {
+        var startTime = Date.now() / 1000;
+        var runTime = '0:00:30';
+        var estimatedRunTime = '0:00:35';
+        var scriptStatus = 7;
+        var directive = compileDirective(
+            startTime, runTime, estimatedRunTime, scriptStatus);
+        expect(directive.html()).not.toEqual('');
+    });
+
+    it('should counter based on passed time', function () {
+        var startTime = (Date.now() / 1000) - 5;  // 5 seconds
+        var runTime = '0:00:30';
+        var estimatedRunTime = '0:00:35';
+        var scriptStatus = 7;
+        var directive = compileDirective(
+            startTime, runTime, estimatedRunTime, scriptStatus);
+        var spanElement = directive.find('span');
+        expect(spanElement).toBeDefined();
+        expect(spanElement.text()).toEqual('0:00:05 of ~' + estimatedRunTime);
+    });
+
+    it('counter updated based on passed time not $interval', function () {
+        var startTime = (Date.now() / 1000) - 5;  // 5 seconds
+        var runTime = '0:00:30';
+        var estimatedRunTime = '0:00:35';
+        var scriptStatus = 7;
+        var directive = compileDirective(
+            startTime, runTime, 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('0:00:05 of ~' + estimatedRunTime);
+    });
+});
diff --git a/src/maasserver/static/partials/script-results-list.html b/src/maasserver/static/partials/script-results-list.html
index 974e44f..4fd4130 100644
--- a/src/maasserver/static/partials/script-results-list.html
+++ b/src/maasserver/static/partials/script-results-list.html
@@ -13,9 +13,9 @@
                         <div class="table__header table-col--2 u-padding--left-none"></div>
                         <div class="table__header table-col--24">Name</div>
                         <div class="table__header table-col--24">Tags</div>
-                        <div class="table__header table-col--10">Runtime</div>
+                        <div class="table__header table-col--15">Runtime</div>
                         <div class="table__header table-col--20">Date</div>
-                        <div class="table__header table-col--15">Result</div>
+                        <div class="table__header table-col--10">Result</div>
                         <div class="table__header table-col--5 u-align--right">Actions</div>
                     </div>
                 </header>
@@ -30,9 +30,9 @@
                                 <button class="icon u-margin--top-tiny u-float--right" data-ng-class="{'icon--open': !result.showing_results, 'icon--close': result.showing_results}" data-ng-if="!result.showing_history"></button>
                             </div>
                             <div class="table__data table-col--24" aria-label="Tags"><span data-ng-hide="result.showing_history">{$ result.tags $}</span></div>
-                            <div class="table__data table-col--10" aria-label="Runtime"><span data-ng-hide="result.showing_history">{$ result.runtime $}</span></div>
+                            <div class="table__data table-col--15" aria-label="Runtime"><span data-ng-hide="result.showing_history" data-maas-script-run-time="script-runtime" data-start-time="result.starttime" data-run-time="{{result.runtime}}" data-estimated-run-time="{{result.estimated_runtime}}" data-script-status="result.status"></span></div>
                             <div class="table__data table-col--20" aria-label="Date"><span data-ng-hide="result.showing_history">{$ result.updated $}</span></div>
-                            <div class="table__data table-col--15" aria-label="Status">
+                            <div class="table__data table-col--10" aria-label="Status">
                                 <span data-ng-hide="result.showing_history">
                                     <!-- Only link to the testing result when we've received it. This is indicated with status 2(passed), 3(failed), 4(timedout), 6(degraded), 8(failed installing)-->
                                     {$ result.status_name $} <a data-ng-if="result.status === 2 || result.status === 3 || result.status === 4 || result.status === 6 || result.status === 8" href="#/node/{$ type_name $}/{$ node.system_id $}/{$ section.area $}/{$ result.id $}">View log</a>
@@ -69,11 +69,11 @@
                                                     <div class="table__data table-col--2 u-padding--left-none" aria-label="Status">
                                                         <span data-maas-script-status="script-status" data-script-status="item.status"></span>
                                                     </div>
-                                                    <div class="table__data table-col--20" aria-label="Name">{$ result.name $}</div>
-                                                    <div class="table__data table-col--25" aria-label="Tags">{$ result.tags $}</div>
-                                                    <div class="table__data table-col--10" aria-label="Runtime">{$ item.runtime $}</div>
+                                                    <div class="table__data table-col--24" aria-label="Name">{$ result.name $}</div>
+                                                    <div class="table__data table-col--24" aria-label="Tags">{$ result.tags $}</div>
+                                                    <div class="table__data table-col--15" aria-label="Runtime"><span data-maas-script-run-time="script-runtime" data-start-time="item.starttime" data-run-time="{{item.runtime}}" data-estimated-run-time="{{item.estimated_runtime}}" data-script-status="item.status"></span></div>
                                                     <div class="table__data table-col--20" aria-label="Date">{$ item.updated $}</div>
-                                                    <div class="table__data table-col--23" aria-label="Status">
+                                                    <div class="table__data table-col--10" aria-label="Status">
                                                         <!-- Only link to the testing result when we've received it. This is indicated with status 2(passed), 3(failed), 4(timedout), 6(degraded), 8(failed installing)-->
                                                         {$ item.status_name $} <a data-ng-if="item.status === 2 || item.status === 3 || item.status === 4 || item.status === 6 || item.status === 8" href="#/node/{$ type_name $}/{$ node.system_id $}/{$ section.area $}/{$ item.id $}">View log</a>
                                                     </div>
diff --git a/src/maasserver/views/combo.py b/src/maasserver/views/combo.py
index 6eb2fd9..e8fc6e1 100755
--- a/src/maasserver/views/combo.py
+++ b/src/maasserver/views/combo.py
@@ -128,6 +128,7 @@ MERGE_VIEWS = {
             "js/angular/directives/release_name.js",
             "js/angular/directives/release_options.js",
             "js/angular/directives/script_results_list.js",
+            "js/angular/directives/script_runtime.js",
             "js/angular/directives/script_select.js",
             "js/angular/directives/script_status.js",
             "js/angular/directives/ssh_keys.js",
diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index 7b719a4..95c70b7 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -605,6 +605,9 @@ class NodeHandler(TimestampedModelHandler):
                 'started': dehydrate_datetime(script_result.started),
                 'ended': dehydrate_datetime(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
             })
             if (script_result.stderr != b'' and
                     script_set.result_type != RESULT_TYPE.TESTING):
@@ -621,6 +624,9 @@ class NodeHandler(TimestampedModelHandler):
                     'started': dehydrate_datetime(script_result.started),
                     'ended': dehydrate_datetime(script_result.ended),
                     'runtime': script_result.runtime,
+                    'starttime': script_result.starttime,
+                    'endtime': script_result.endtime,
+                    'estimated_runtime': script_result.estimated_runtime,
                 })
         return sorted(ret, key=lambda i: i['name'])
 
diff --git a/src/maasserver/websockets/handlers/node_result.py b/src/maasserver/websockets/handlers/node_result.py
index a405d06..e6e516e 100644
--- a/src/maasserver/websockets/handlers/node_result.py
+++ b/src/maasserver/websockets/handlers/node_result.py
@@ -76,6 +76,9 @@ class NodeResultHandler(TimestampedModelHandler):
         data["name"] = obj.name
         data["status_name"] = obj.status_name
         data["runtime"] = obj.runtime
+        data["starttime"] = obj.starttime
+        data["endtime"] = obj.endtime
+        data["estimated_runtime"] = obj.estimated_runtime
         data["result_type"] = obj.script_set.result_type
         if obj.script is not None:
             data["hardware_type"] = obj.script.hardware_type
@@ -92,6 +95,9 @@ class NodeResultHandler(TimestampedModelHandler):
                 "status": history.status,
                 "status_name": history.status_name,
                 "runtime": history.runtime,
+                "starttime": history.starttime,
+                "endtime": history.endtime,
+                "estimated_runtime": history.estimated_runtime,
             } for history in obj.history
         ]
         try:
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index edebbea..5080cfa 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -1277,6 +1277,9 @@ class TestMachineHandler(MAASServerTestCase):
                 'started': dehydrate_datetime(script_result.started),
                 'ended': dehydrate_datetime(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
             },
             {
                 'id': script_result.id,
@@ -1292,6 +1295,9 @@ class TestMachineHandler(MAASServerTestCase):
                 'started': dehydrate_datetime(script_result.started),
                 'ended': dehydrate_datetime(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
             }], handler.dehydrate_script_set(script_set))
 
     def test_dehydrate_script_set_returns_output_if_stdout_empty(self):
@@ -1318,6 +1324,9 @@ class TestMachineHandler(MAASServerTestCase):
                 'started': dehydrate_datetime(script_result.started),
                 'ended': dehydrate_datetime(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
             }, handler.dehydrate_script_set(script_result.script_set)[0])
 
     def test_dehydrate_script_set_returns_combined_for_testing(self):
@@ -1341,6 +1350,9 @@ class TestMachineHandler(MAASServerTestCase):
                 'started': dehydrate_datetime(script_result.started),
                 'ended': dehydrate_datetime(script_result.ended),
                 'runtime': script_result.runtime,
+                'starttime': script_result.starttime,
+                'endtime': script_result.endtime,
+                'estimated_runtime': script_result.estimated_runtime,
             }, handler.dehydrate_script_set(script_result.script_set)[0])
 
     def test_dehydrate_script_set_status(self):
diff --git a/src/maasserver/websockets/handlers/tests/test_node_result.py b/src/maasserver/websockets/handlers/tests/test_node_result.py
index 0c3013e..5b3fc37 100644
--- a/src/maasserver/websockets/handlers/tests/test_node_result.py
+++ b/src/maasserver/websockets/handlers/tests/test_node_result.py
@@ -42,6 +42,9 @@ class TestNodeResultHandler(MAASServerTestCase):
             "started": dehydrate_datetime(script_result.started),
             "ended": dehydrate_datetime(script_result.ended),
             "runtime": script_result.runtime,
+            "starttime": script_result.starttime,
+            "endtime": script_result.endtime,
+            "estimated_runtime": script_result.estimated_runtime,
             "name": script_result.name,
             "result_type": script_result.script_set.result_type,
             "hardware_type": script_result.script.hardware_type,
@@ -52,6 +55,9 @@ class TestNodeResultHandler(MAASServerTestCase):
                 "status": history.status,
                 "status_name": history.status_name,
                 "runtime": history.runtime,
+                "starttime": history.starttime,
+                "endtime": history.endtime,
+                "estimated_runtime": history.estimated_runtime,
                 } for history in script_result.history],
             "results": [{
                 "name": key,
diff --git a/src/metadataserver/models/scriptresult.py b/src/metadataserver/models/scriptresult.py
index 7620ddd..dccda0a 100644
--- a/src/metadataserver/models/scriptresult.py
+++ b/src/metadataserver/models/scriptresult.py
@@ -117,6 +117,51 @@ class ScriptResult(CleanSave, TimestampedModel):
         else:
             return ''
 
+    @property
+    def starttime(self):
+        if self.started is not None:
+            return self.started.timestamp()
+        else:
+            return ''
+
+    @property
+    def endtime(self):
+        if self.ended is not None:
+            return self.ended.timestamp()
+        else:
+            return ''
+
+    @property
+    def estimated_runtime(self):
+        # If there is a runtime the script has completed, no need to calculate
+        # an estimate.
+        if self.runtime != '':
+            return self.runtime
+        runtime = None
+        # Get an estimated runtime from previous runs.
+        for script_result in self.history:
+            # Only look at passed results when calculating an estimated
+            # runtime. Failed results may take longer or shorter than
+            # average. Don't use self.history.filter for this as the now
+            # cached history list may be used elsewhere.
+            if script_result.status != SCRIPT_STATUS.PASSED:
+                continue
+            previous_runtime = script_result.ended - script_result.started
+            if runtime is None:
+                runtime = previous_runtime
+            else:
+                runtime += previous_runtime
+                runtime = runtime / 2
+        if runtime is None:
+            if self.script is not None and self.script.timeout != timedelta(0):
+                # If there were no previous runs use the script's timeout.
+                return str(self.script.timeout - timedelta(
+                    microseconds=self.script.timeout.microseconds))
+            else:
+                return 'Unknown'
+        else:
+            return str(runtime - timedelta(microseconds=runtime.microseconds))
+
     def __str__(self):
         return "%s/%s" % (self.script_set.node.system_id, self.name)
 
diff --git a/src/metadataserver/models/tests/test_scriptresult.py b/src/metadataserver/models/tests/test_scriptresult.py
index ed8f41e..65f4fc7 100644
--- a/src/metadataserver/models/tests/test_scriptresult.py
+++ b/src/metadataserver/models/tests/test_scriptresult.py
@@ -417,6 +417,80 @@ class TestScriptResult(MAASServerTestCase):
         script_result = factory.make_ScriptResult(status=SCRIPT_STATUS.PENDING)
         self.assertEquals('', script_result.runtime)
 
+    def test_get_starttime(self):
+        now = datetime.now()
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.PASSED,
+            started=now, ended=now)
+        self.assertEquals(now.timestamp(), script_result.starttime)
+
+    def test_get_starttime_None(self):
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.PENDING)
+        self.assertEquals('', script_result.starttime)
+
+    def test_get_endtime(self):
+        now = datetime.now()
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.PASSED,
+            started=now, ended=now)
+        self.assertEquals(now.timestamp(), script_result.endtime)
+
+    def test_get_endtime_None(self):
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.PENDING)
+        self.assertEquals('', script_result.endtime)
+
+    def test_estimated_runtime_returns_set_runtime(self):
+        now = datetime.now()
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.PENDING,
+            started=now, ended=(now + factory.make_timedelta()))
+        self.assertEquals(
+            script_result.runtime, script_result.estimated_runtime)
+
+    def test_estimated_runtime_returns_average_of_previous(self):
+        script = factory.make_Script()
+        script_set = factory.make_ScriptSet()
+        old_results = [
+            factory.make_ScriptResult(
+                status=SCRIPT_STATUS.PASSED,
+                script=script, script_set=script_set)
+            for _ in range(10)
+        ]
+        factory.make_ScriptResult(
+            status=SCRIPT_STATUS.FAILED,
+            script=script, script_set=script_set)
+        average_runtime = (old_results[9].ended - old_results[9].started)
+        for result in reversed(old_results[:-1]):
+            average_runtime += result.ended - result.started
+            average_runtime = average_runtime / 2
+        now = datetime.now()
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.RUNNING, started=now,
+            script=script, script_set=script_set)
+        expected = str(
+            average_runtime - timedelta(
+                microseconds=average_runtime.microseconds))
+        self.assertEquals(
+            expected, script_result.estimated_runtime)
+
+    def test_estimated_runtime_uses_timeout(self):
+        now = datetime.now()
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.RUNNING, started=now)
+        expected = str(script_result.script.timeout - timedelta(
+            microseconds=script_result.script.timeout.microseconds))
+        self.assertEquals(expected, script_result.estimated_runtime)
+
+    def test_estimated_runtime_returns_Unknown(self):
+        now = datetime.now()
+        script_result = factory.make_ScriptResult(
+            status=SCRIPT_STATUS.RUNNING, started=now)
+        script_result.script.timeout = timedelta(0)
+        script_result.script.save()
+        self.assertEquals("Unknown", script_result.estimated_runtime)
+
     def test_read_results(self):
         results = {
             'status': random.choice(