darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 00:06:16 -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

8
migrations/versions/0049_set_job_status.py → migrations/versions/0051_set_job_status.py
View File

@@ -1,14 +1,14 @@
"""empty message """empty message
Revision ID: 0049_set_job_status Revision ID: 0051_set_job_status
Revises: 0048_job_scheduled_time Revises: 0050_index_for_stats
Create Date: 2016-08-24 13:21:51.744526 Create Date: 2016-08-24 13:21:51.744526
""" """
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '0049_set_job_status' revision = '0051_set_job_status'
down_revision = '0048_job_scheduled_time' down_revision = '0050_index_for_stats'
from alembic import op from alembic import op

8
migrations/versions/0050_drop_jobs_status.py → migrations/versions/0052_drop_jobs_status.py
View File

@@ -1,14 +1,14 @@
"""empty message """empty message
Revision ID: 0050_drop_jobs_status Revision ID: 0052_drop_jobs_status
Revises: 0049_set_job_status Revises: 0051_set_job_status
Create Date: 2016-08-25 15:56:31.779399 Create Date: 2016-08-25 15:56:31.779399
""" """
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '0050_drop_jobs_status' revision = '0052_drop_jobs_status'
down_revision = '0049_set_job_status' down_revision = '0051_set_job_status'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa

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)) resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['data']['id'] == fake_uuid 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, assert resp_json['data']['scheduled_for'] == datetime(2016, 1, 2, 11, 59, 0,
tzinfo=pytz.UTC).isoformat() tzinfo=pytz.UTC).isoformat()
assert resp_json['data']['job_status'] == 'scheduled' assert resp_json['data']['job_status'] == 'scheduled'