Skip to content
This repository has been archived by the owner on Jun 12, 2018. It is now read-only.

Commit

Permalink
Minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
justinvdm committed Dec 24, 2014
1 parent adb58c3 commit ed9355c
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions go/vumitools/tests/test_routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,7 @@ def test_inbound_message_from_transport_to_optout(self):
msg = self.with_md(self.msg_helper.make_inbound("stop"), tag=tag)
yield self.dispatch_inbound(msg, 'sphex')
self.assert_rkeys_used('sphex.inbound', 'optout.inbound')
self.with_md(
msg,
user_account=self.user_account_key,
self.with_md(msg, user_account=self.user_account_key,
optout={
'optout': True,
'optout_keyword': 'stop'
Expand Down Expand Up @@ -682,7 +680,7 @@ def test_inbound_message_from_router_to_custom_endpoint(self):
yield self.get_dispatcher()
msg = self.with_md(
self.msg_helper.make_outbound("foo"),
optout={'optout': False},
optout={'optout': False},
router=('router', 'router1'),
endpoint='other')
yield self.dispatch_inbound(msg, 'router_ro')
Expand Down Expand Up @@ -1050,8 +1048,7 @@ def test_inbound_message_from_billing_to_app1(self):
self.assert_rkeys_used(
'billing_dispatcher_ro.inbound', 'app1.inbound')

self.with_md(msg, conv=('app1', 'conv1'),
hops=[
self.with_md(msg, conv=('app1', 'conv1'), hops=[
['BILLING:OUTBOUND', 'default'],
['CONVERSATION:app1:conv1', 'default'],
])
Expand All @@ -1070,8 +1067,8 @@ def test_inbound_optout_message_from_transport_to_billing(self):
['TRANSPORT_TAG:pool1:1234', 'default'],
['BILLING:INBOUND', 'default'],
]
self.with_md(msg, user_account=self.user_account_key,
hops=hops, optout={
self.with_md(msg, user_account=self.user_account_key, hops=hops,
optout={
'optout': True,
'optout_keyword': 'stop'
})
Expand Down Expand Up @@ -1489,8 +1486,7 @@ def test_event_for_unroutable_inbound_reply_on_last_hop(self):
yield self.get_dispatcher()
msg, ack = yield self.mk_msg_ack(
tag=('pool1', '1234'), is_reply_to_unroutable=True,
user_account=self.user_account_key,
hops=[
user_account=self.user_account_key, hops=[
['ROUTER:router:router1:INBOUND', 'other'],
['TRANSPORT_TAG:pool1:1234', 'default'],
])
Expand Down

0 comments on commit ed9355c

Please sign in to comment.