Fix db migration merge conflict

Update create_service_with_inbound_number

migrations/versions/0137_sms_sender_nullable.py

@@ -1,7 +1,7 @@
 """
 
-Revision ID: 0135_sms_sender_nullable
+Revision ID: 0137_sms_sender_nullable
-Revises: 0134_add_email_2fa_template
+Revises: 0136_user_mobile_nullable
 Create Date: 2017-11-06 15:44:59.471977
 
 """
@@ -9,8 +9,8 @@ from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-revision = '0135_sms_sender_nullable'
+revision = '0137_sms_sender_nullable'
-down_revision = '0134_add_email_2fa_template'
+down_revision = '0136_user_mobile_nullable'
 
 
 def upgrade():

tests/app/db.py

@@ -89,29 +89,9 @@ def create_service(
 
 def create_service_with_inbound_number(
     inbound_number='1234567',
-    user=None,
+    *args, **kwargs
-    service_name="Sample service",
-    service_id=None,
-    restricted=False,
-    service_permissions=[EMAIL_TYPE, SMS_TYPE],
-    research_mode=False,
-    active=True,
-    email_from=None,
-    prefix_sms=None
 ):
-    service = Service(
+    service = create_service(*args, **kwargs)
-        name=service_name,
-        message_limit=1000,
-        restricted=restricted,
-        email_from=email_from if email_from else service_name.lower().replace(' ', '.'),
-        created_by=user or create_user(email='{}@digital.cabinet-office.gov.uk'.format(uuid.uuid4())),
-        prefix_sms=prefix_sms,
-    )
-
-    dao_create_service(service, service.created_by, service_id, service_permissions=service_permissions)
-
-    service.active = active
-    service.research_mode = research_mode
 
     sms_sender = ServiceSmsSender.query.filter_by(service_id=service.id).first()
     inbound = create_inbound_number(number=inbound_number, service_id=service.id)

tests/app/service/test_rest.py

@@ -35,8 +35,7 @@ from tests.app.db import (
     create_letter_contact,
     create_inbound_number,
     create_service_sms_sender,
-    create_service_with_defined_sms_sender,
+    create_service_with_defined_sms_sender
-    create_service_with_inbound_number
 )
 from tests.app.db import create_user
 from app.dao.date_util import get_current_financial_year_start_year