Merge "Revert "Event list can not display "timestamp""

This commit is contained in:
Jenkins 2016-09-21 13:01:24 +00:00 committed by Gerrit Code Review
commit 95ba61263e
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ class Event(resource.Resource):
# Properties
#: Timestamp string (in ISO8601 format) when the event was generated.
timestamp = resource.Body('timestamp')
generated_at = resource.Body('timestamp')
#: The UUID of the object related to this event.
obj_id = resource.Body('oid')
#: The name of the object related to this event.

View File

@ -57,5 +57,5 @@ class TestEvent(testtools.TestCase):
self.assertEqual(FAKE['project'], sot.project_id)
self.assertEqual(FAKE['status'], sot.status)
self.assertEqual(FAKE['status_reason'], sot.status_reason)
self.assertEqual(FAKE['timestamp'], sot.timestamp)
self.assertEqual(FAKE['timestamp'], sot.generated_at)
self.assertEqual(FAKE['user'], sot.user_id)