Merge lp:~bigkevmcd/offspring/fix-bug-983465 into lp:offspring

[Kevin McDermott]

This is a trival test and fix for this bug, am surprised it's gone so long without a fix...

[Timothy R. Chavez (timrchavez)]

review: Approve

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2013-10-10 15:23:03 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2013-10-24 09:44:51 +0000
@@ -392,7 +392,11 @@
     def setUp(self):
         self.user = factory.make_user()
         self.project = factory.make_project()
-        self.build = factory.make_build_result(project=self.project)
+        started_at = datetime.utcnow() - timedelta(hours=2)
+        self.build = factory.make_build_result(
+            project=self.project,
+            finished_at=started_at + timedelta(minutes=30),
+            started_at=started_at)
         self.view_url = reverse('offspring.web.queuemanager.views.builds')
 
     def test_builds_view(self):
@@ -403,6 +407,9 @@
         self.assertContains(
             response, self.build.name, status_code=200,
             msg_prefix=response.content)
+        fmt = "%b %d %Y %H:%M:%S"
+        self.assertContains(response, self.build.started_at.strftime(fmt))
+        self.assertContains(response, self.build.finished_at.strftime(fmt))
 
 
 class LaunchpadProjectViewsTests(TestCase):

=== modified file 'lib/offspring/web/templates/queuemanager/builds.html'
--- lib/offspring/web/templates/queuemanager/builds.html	2013-07-04 19:45:29 +0000
+++ lib/offspring/web/templates/queuemanager/builds.html	2013-10-24 09:44:51 +0000
@@ -43,10 +43,10 @@
                 {% endif %}
             </td>
             <td>
-                {{ build_result.started_at|default:""|date:"M d Y H:m:s" }}
+                {{ build_result.started_at|default:""|date:"M d Y H:i:s" }}
             </td>
             <td>
-                {{ build_result.finished_at|default:""|date:"M d Y H:m:s" }}
+                {{ build_result.finished_at|default:""|date:"M d Y H:i:s" }}
             </td>
             <td>
                 {% if build_result.requestor %}