darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-19 05:58:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #640 from alphagov/scheduled-delivery-of-jobs-cleanup

Browse Source 
Scheduled delivery of jobs cleanup
This commit is contained in:
minglis
2016-09-05 12:29:10 +01:00
committed by GitHub
parent 6ceb80d32f e3fa8bffd7
commit 64bb12c866
5 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/app/dao/test_jobs_dao.py
View File

@@ -215,15 +215,15 @@ def test_get_jobs_for_service_in_created_at_order(notify_db, notify_db_session,
def test_update_job(sample_job):
assert sample_job.status == 'pending'
assert sample_job.job_status == 'pending'
sample_job.status = 'in progress'
sample_job.job_status = 'in progress'
dao_update_job(sample_job)
job_from_db = Job.query.get(sample_job.id)
assert job_from_db.status == 'in progress'
assert job_from_db.job_status == 'in progress'
def test_get_scheduled_jobs_gets_all_jobs_in_scheduled_state_scheduled_before_now(notify_db, notify_db_session):

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

@@ -139,8 +139,8 @@ def test_create_unscheduled_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']['statistics'] == []
assert resp_json['data']['job_status'] == 'pending'
assert not resp_json['data']['scheduled_for']
assert resp_json['data']['job_status'] == 'pending'
assert resp_json['data']['template'] == str(sample_template.id)
@@ -177,8 +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']['statistics'] == []
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'