Removed some messagebird hlr related tests

Author: tejas7777

src/worker/webhooks.py

@@ -11,7 +11,7 @@
 from ua_parser.user_agent_parser import Parse as ParseUserAgent
 
 from src.schemas.messages import SendMethod
-from src.schemas.webhooks import BaseWebhook, MandrillWebhook
+from src.schemas.webhooks import BaseWebhook, MandrillWebhook, MessageBirdWebHook
 
 main_logger = logging.getLogger('worker.webhooks')
 
@@ -98,7 +98,7 @@ async def update_message_status(ctx, send_method: SendMethod, m: BaseWebhook, lo
             values=Values(message_id=message_id, status=m.status, ts=m.ts, extra=m.extra_json()),
         ),
     ]
-    if hasattr(m, 'price_amount'):
+    if isinstance(m, MessageBirdWebHook):
         cost = m.price_amount
         qs.append(
             glove.pg.execute_b('update messages set cost=:cost where id=:message_id', cost=cost, message_id=message_id)

tests/test_sms.py

@@ -1,4 +1,3 @@
-import logging
 import re
 from buildpg import V
 from buildpg.clauses import Where
@@ -223,70 +222,6 @@ def test_send_messagebird(cli, tmpdir, dummy_server, worker, loop):
     assert dummy_server.log[1] == 'POST /messagebird/messages > 201'
 
 
-def test_messagebird_no_hlr(cli, tmpdir, dummy_server, worker, caplog, loop):
-    data = {
-        'uid': str(uuid4()),
-        'company_code': 'foobar',
-        'method': 'sms-messagebird',
-        'main_template': 'this is a message',
-        'recipients': [{'number': '07888888888'}],
-    }
-    r = cli.post('/send/sms/', json=data, headers={'Authorization': 'testing-key'})
-    assert r.status_code == 201, r.text
-    assert worker.test_run() == 1
-    assert [
-        'POST /messagebird/hlr > 201',
-        *['GET /messagebird/hlr/447888888888 > 200' for _ in range(60)],
-    ] == dummy_server.log
-    dummy_server.log = []
-    assert 'No HLR result found for +447888888888 after 30 attempts' in caplog.messages
-
-
-def test_messsagebird_no_hlr_found(cli, tmpdir, dummy_server, worker, caplog, loop):
-    data = {
-        'uid': str(uuid4()),
-        'company_code': 'foobar',
-        'method': 'sms-messagebird',
-        'main_template': 'this is a message',
-        'recipients': [{'number': '07877777777'}],
-    }
-    r = cli.post('/send/sms/', json=data, headers={'Authorization': 'testing-key'})
-    assert r.status_code == 201, r.text
-    assert worker.test_run() == 1
-    assert [
-        'POST /messagebird/hlr > 201',
-        *['GET /messagebird/hlr/447877777777 > 404' for _ in range(60)],
-    ] == dummy_server.log
-    dummy_server.log = []
-    assert 'No HLR result found for +447877777777 after 30 attempts' in caplog.messages
-
-
-def test_messagebird_no_network(cli, tmpdir, dummy_server, worker, caplog, loop):
-    data = {
-        'uid': str(uuid4()),
-        'company_code': 'foobar',
-        'method': 'sms-messagebird',
-        'main_template': 'this is a message',
-        'recipients': [{'number': '07777777777'}],
-    }
-    caplog.set_level(logging.INFO)
-    r = cli.post('/send/sms/', json=data, headers={'Authorization': 'testing-key'})
-    assert r.status_code == 201, r.text
-    assert worker.test_run() == 1
-    assert [
-        'POST /messagebird/hlr > 201',
-        'GET /messagebird/hlr/447777777777 > 200',
-        'GET /messagebird/hlr/447777777777 > 200',
-        'GET /messagebird/pricing/sms/outbound > 200',
-        'POST /messagebird/messages > 201',
-    ] == dummy_server.log
-    dummy_server.log = []
-    assert (
-        """found result for +447777777777 after 1 attempts {\n  "status": "active",\n  "network": "o2"\n}"""
-        in caplog.messages
-    )
-
-
 def test_messagebird_webhook(cli, sync_db: SyncDb, dummy_server, worker, loop):
     data = {
         'uid': str(uuid4()),