test no longer applicable as null sms_sender is an error now

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

@@ -214,11 +214,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
 
     auth_header_fetch = create_authorization_header()
 
@@ -1184,7 +1180,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', [