diff --git a/module_build_service/models.py b/module_build_service/models.py index e04cd361..baccdedd 100644 --- a/module_build_service/models.py +++ b/module_build_service/models.py @@ -282,15 +282,15 @@ class ModuleBuild(MBSBase): 'state_url': get_url_for('module_build', id=self.id), 'scmurl': self.scmurl, 'owner': self.owner, - 'time_submitted': self.time_submitted, - 'time_modified': self.time_modified, - 'time_completed': self.time_completed, + 'time_submitted': self._utc_datetime_to_iso(self.time_submitted), + 'time_modified': self._utc_datetime_to_iso(self.time_modified), + 'time_completed': self._utc_datetime_to_iso(self.time_completed), "tasks": self.tasks(), # TODO, show their entire .json() ? 'component_builds': [build.id for build in self.component_builds], 'modulemd': self.modulemd, 'koji_tag': self.koji_tag, - 'state_trace': [{'time': record.state_time, + 'state_trace': [{'time': self._utc_datetime_to_iso(record.state_time), 'state': record.state, 'state_name': INVERSE_BUILD_STATES[record.state], 'reason': record.state_reason} @@ -372,7 +372,7 @@ class ModuleBuildTrace(MBSBase): retval = { 'id': self.id, 'module_id': self.module_id, - 'state_time': self.state_time, + 'state_time': self._utc_datetime_to_iso(self.state_time), 'state': self.state, 'state_reason': self.state_reason, } @@ -473,7 +473,7 @@ class ComponentBuildTrace(MBSBase): retval = { 'id': self.id, 'component_id': self.component_id, - 'state_time': self.state_time, + 'state_time': self._utc_datetime_to_iso(self.state_time), 'state': self.state, 'state_reason': self.state_reason, 'task_id': self.task_id, diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py index d923d536..3e417d3d 100644 --- a/tests/test_views/test_views.py +++ b/tests/test_views/test_views.py @@ -178,9 +178,9 @@ class TestViews(unittest.TestCase): }, }, }) - self.assertEquals(data['time_completed'], u'Sat, 03 Sep 2016 11:25:32 GMT') - self.assertEquals(data['time_modified'], u'Sat, 03 Sep 2016 11:25:32 GMT') - self.assertEquals(data['time_submitted'], u'Sat, 03 Sep 2016 11:23:20 GMT') + self.assertEquals(data['time_completed'], u'2016-09-03T11:25:32Z') + self.assertEquals(data['time_modified'], u'2016-09-03T11:25:32Z') + self.assertEquals(data['time_submitted'], u'2016-09-03T11:23:20Z') self.assertEquals(data['version'], '2') def test_pagination_metadata(self):