Fix merge conflict

Unity-Technologies · Apr 23, 2018 · 408fcbd · 408fcbd
1 parent 246eca8
commit 408fcbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/master/buildbot/status/web/build.py b/master/buildbot/status/web/build.py
@@ -359,9 +359,11 @@ def __prepare_context(self, request, cxt=None):
         start, end = self.build_status.getTimes()
         context['start'] = time.ctime(start)
         context['end'] = time.ctime(end) if end else None
+        context['elapsed'] = None
         if not end:
             end = util.now()
-        context['elapsed'] = util.formatInterval(end - start)
+        if start:
+            context['elapsed'] = util.formatInterval(end - start)
 
         context['authz'] = self.getAuthz(request)
         context['has_changes'] = False

diff --git a/master/buildbot/test/unit/test_status_build.py b/master/buildbot/test/unit/test_status_build.py
@@ -250,8 +250,8 @@ def getTimes(self):
     def getResults(self):
         return self.results
 
-    def prepare_trigger_links(self):
-        pass
+    def prepare_trigger_links(self, codebases_arg):
+        return []
 
 
 class TestBuildStepsUtils(unittest.TestCase):