Reorder DB scripts after merge from master

migrations/versions/0022_add_processing_dates.py

@@ -8,7 +8,7 @@ Create Date: 2016-02-24 17:15:47.457200
 
 # revision identifiers, used by Alembic.
 revision = '0022_add_processing_dates'
-down_revision = '0021_add_job_metadata'
+down_revision = '0022_add_invite_users'
 
 from alembic import op
 import sqlalchemy as sa

migrations/versions/0023_add_sender.py

@@ -1,13 +1,13 @@
 """empty message
 
-Revision ID: d98c7c20f1d4
+Revision ID: 0023_add_sender
 Revises: 0022_add_processing_dates
 Create Date: 2016-02-24 17:18:21.942772
 
 """
 
 # revision identifiers, used by Alembic.
-revision = 'd98c7c20f1d4'
+revision = '0023_add_sender'
 down_revision = '0022_add_processing_dates'
 
 from alembic import op

migrations/versions/0023_drop_token.py

@@ -1,14 +1,14 @@
 """empty message
 
 Revision ID: 0023_drop_token
-Revises: 0022_add_invite_users
+Revises: 0023_add_sender
 Create Date: 2016-02-24 13:58:04.440296
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '0023_drop_token'
-down_revision = '0022_add_invite_users'
+down_revision = '0023_add_sender'
 
 from alembic import op
 import sqlalchemy as sa

tests/app/conftest.py

@@ -103,7 +103,6 @@ def sample_service(notify_db,
         user = sample_user(notify_db, notify_db_session)
     data = {
         'name': service_name,
-        'users': [user],
         'limit': 1000,
         'active': False,
         'restricted': False,

tests/app/service/test_rest.py

@@ -385,6 +385,6 @@ def test_get_users_for_service_returns_empty_list_if_no_users_associated_with_se
                 '/service/{}/users'.format(sample_service.id),
                 headers=[('Content-Type', 'application/json'), auth_header]
             )
-            assert response.status_code == 200
             result = json.loads(response.get_data(as_text=True))
+            assert response.status_code == 200
             assert result['data'] == []