modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-08 21:29:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #536 Convert all dates to ISO in the API.

Browse Source
This commit is contained in:
Ralph Bean
2017-05-04 17:57:11 +00:00
parent 0af508f051 3f8cacd8e5
commit 4bfe1f75ed
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module_build_service/models.py
View File

@@ -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,

6
tests/test_views/test_views.py
View File

@@ -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):