From e3fa8bffd7dd436a9d3da68058528d3ad1cd2c09 Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Fri, 2 Sep 2016 12:01:38 +0100
Subject: [PATCH] Fix merge conflicts in tests. Update new migrations scripts
 to fix conflict in with script names.

---
 .../{0049_set_job_status.py => 0051_set_job_status.py}    | 8 ++++----
 ...{0050_drop_jobs_status.py => 0052_drop_jobs_status.py} | 8 ++++----
 tests/app/job/test_rest.py                                | 1 -
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename migrations/versions/{0049_set_job_status.py => 0051_set_job_status.py} (65%)
 rename migrations/versions/{0050_drop_jobs_status.py => 0052_drop_jobs_status.py} (85%)

diff --git a/migrations/versions/0049_set_job_status.py b/migrations/versions/0051_set_job_status.py
similarity index 65%
rename from migrations/versions/0049_set_job_status.py
rename to migrations/versions/0051_set_job_status.py
index b768a4906..751ea2c02 100644
--- a/migrations/versions/0049_set_job_status.py
+++ b/migrations/versions/0051_set_job_status.py
@@ -1,14 +1,14 @@
 """empty message
 
-Revision ID: 0049_set_job_status
-Revises: 0048_job_scheduled_time
+Revision ID: 0051_set_job_status
+Revises: 0050_index_for_stats
 Create Date: 2016-08-24 13:21:51.744526
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '0049_set_job_status'
-down_revision = '0048_job_scheduled_time'
+revision = '0051_set_job_status'
+down_revision = '0050_index_for_stats'
 
 from alembic import op
 
diff --git a/migrations/versions/0050_drop_jobs_status.py b/migrations/versions/0052_drop_jobs_status.py
similarity index 85%
rename from migrations/versions/0050_drop_jobs_status.py
rename to migrations/versions/0052_drop_jobs_status.py
index c5f4768ee..75ab6d180 100644
--- a/migrations/versions/0050_drop_jobs_status.py
+++ b/migrations/versions/0052_drop_jobs_status.py
@@ -1,14 +1,14 @@
 """empty message
 
-Revision ID: 0050_drop_jobs_status
-Revises: 0049_set_job_status
+Revision ID: 0052_drop_jobs_status
+Revises: 0051_set_job_status
 Create Date: 2016-08-25 15:56:31.779399
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '0050_drop_jobs_status'
-down_revision = '0049_set_job_status'
+revision = '0052_drop_jobs_status'
+down_revision = '0051_set_job_status'
 
 from alembic import op
 import sqlalchemy as sa
diff --git a/tests/app/job/test_rest.py b/tests/app/job/test_rest.py
index 732baa756..7f1c9b5bc 100644
--- a/tests/app/job/test_rest.py
+++ b/tests/app/job/test_rest.py
@@ -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'