Merge "Fix date format to be compliant with UTC"
This commit is contained in:
commit
1df4688d10
|
@ -85,7 +85,6 @@ class _QinlingModelBase(oslo_models.ModelBase, oslo_models.TimestampMixin):
|
||||||
updated_at = getattr(self, 'updated_at')
|
updated_at = getattr(self, 'updated_at')
|
||||||
if updated_at:
|
if updated_at:
|
||||||
setattr(m, 'updated_at', updated_at.isoformat(' '))
|
setattr(m, 'updated_at', updated_at.isoformat(' '))
|
||||||
|
|
||||||
return m
|
return m
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
|
|
|
@ -217,9 +217,12 @@ class TestJobController(base.APITest):
|
||||||
count=10
|
count=10
|
||||||
).id
|
).id
|
||||||
|
|
||||||
|
next_hour_and_half = datetime.utcnow() + timedelta(hours=1.5)
|
||||||
|
next_two_hours = datetime.utcnow() + timedelta(hours=2)
|
||||||
|
|
||||||
req_body = {
|
req_body = {
|
||||||
'next_execution_time': str(
|
'next_execution_time': str(
|
||||||
datetime.utcnow() + timedelta(hours=1.5)
|
next_hour_and_half.strftime('%Y-%m-%dT%H:%M:%SZ')
|
||||||
),
|
),
|
||||||
'pattern': '1 */1 * * *'
|
'pattern': '1 */1 * * *'
|
||||||
}
|
}
|
||||||
|
@ -239,7 +242,9 @@ class TestJobController(base.APITest):
|
||||||
|
|
||||||
req_body = {
|
req_body = {
|
||||||
'status': status.RUNNING,
|
'status': status.RUNNING,
|
||||||
'next_execution_time': str(datetime.utcnow() + timedelta(hours=2)),
|
'next_execution_time': str(
|
||||||
|
next_two_hours.strftime('%Y-%m-%dT%H:%M:%SZ')
|
||||||
|
),
|
||||||
}
|
}
|
||||||
resp = self.app.put_json('/v1/jobs/%s' % job_id, req_body)
|
resp = self.app.put_json('/v1/jobs/%s' % job_id, req_body)
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ def datetime_to_str(dct, attr_name):
|
||||||
"""Convert datetime object in dict to string."""
|
"""Convert datetime object in dict to string."""
|
||||||
if (dct.get(attr_name) is not None and
|
if (dct.get(attr_name) is not None and
|
||||||
not isinstance(dct.get(attr_name), six.string_types)):
|
not isinstance(dct.get(attr_name), six.string_types)):
|
||||||
dct[attr_name] = dct[attr_name].isoformat(' ')
|
dct[attr_name] = dct[attr_name].strftime('%Y-%m-%dT%H:%M:%SZ')
|
||||||
|
|
||||||
|
|
||||||
def generate_unicode_uuid(dashed=True):
|
def generate_unicode_uuid(dashed=True):
|
||||||
|
|
Loading…
Reference in New Issue