test no longer applicable as null sms_sender is an error now

migrations/versions/0086_govuk_sms_sender.py

@@ -1,14 +1,14 @@
 """empty message
 
-Revision ID: 0085_govuk_sms_sender
-Revises: 0084_add_job_stats
+Revision ID: 0086_govuk_sms_sender
+Revises: 0085_update_incoming_to_inbound
 Create Date: 2017-05-22 13:46:09.584801
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '0085_govuk_sms_sender'
-down_revision = '0084_add_job_stats'
+revision = '0086_govuk_sms_sender'
+down_revision = '0085_update_incoming_to_inbound'
 
 from alembic import op
 

tests/app/delivery/test_send_to_providers.py

@@ -627,7 +627,6 @@ def test_should_set_international_phone_number_to_sent_status(
     # if 40604 is actually in DB then treat that as if entered manually
     ('40604', '40604', 'bar'),
     # 'testing' is the FROM_NUMBER during unit tests
-    (None, 'testing', 'Sample service: bar'),
     ('testing', 'testing', 'Sample service: bar'),
 ])
 def test_should_handle_sms_sender_and_prefix_message(

tests/app/service/test_rest.py

@@ -240,11 +240,7 @@ def test_create_service(client, sample_user):
     assert json_resp['data']['email_from'] == 'created.service'
     assert not json_resp['data']['research_mode']
     assert json_resp['data']['dvla_organisation'] == '001'
-<<<<<<< HEAD
     assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER']
-=======
-    assert json_resp['data']['sms_sender'] == 'GOVUK'
->>>>>>> set sms_sender to be 'GOVUK' if not otherwise specified
 
     service_db = Service.query.get(json_resp['data']['id'])
     assert service_db.name == 'created service'
@@ -1369,7 +1365,7 @@ def test_set_sms_sender_for_service_rejects_null(client, sample_service):
     result = json.loads(resp.get_data(as_text=True))
     assert resp.status_code == 400
     assert result['result'] == 'error'
-    assert result['message'] == {'sms_sender': 'Field may not be null.'}
+    assert result['message'] == {'sms_sender': ['Field may not be null.']}
 
 
 @pytest.mark.parametrize('today_only,stats', [