darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-29 04:09:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts in tests.

Browse Source 
Update new migrations scripts to fix conflict in with script names.
This commit is contained in:
Rebecca Law
2016-09-02 12:01:38 +01:00
parent 8f3e8181fe
commit e3fa8bffd7
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/app/job/test_rest.py
View File

@@ -177,7 +177,6 @@ def test_create_scheduled_job(notify_api, sample_template, mocker, fake_uuid):
resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['data']['id'] == fake_uuid
assert resp_json['data']['status'] == 'pending'
assert resp_json['data']['scheduled_for'] == datetime(2016, 1, 2, 11, 59, 0,
tzinfo=pytz.UTC).isoformat()
assert resp_json['data']['job_status'] == 'scheduled'