open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd_receive.py: expose wormhole object to tests

Browse Source
This commit is contained in:
Brian Warner 2017-05-14 18:35:01 -07:00
parent c9eb281a8a
commit f762e1592f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wormhole/cli/cmd_receive.py
View File

@ -25,7 +25,7 @@ class TransferRejectedError(RespondError):
def __init__(self): def __init__(self):
RespondError.__init__(self, "transfer rejected") RespondError.__init__(self, "transfer rejected")
def receive(args, reactor=reactor): def receive(args, reactor=reactor, _debug_stash_wormhole=None):
"""I implement 'wormhole receive'. I return a Deferred that fires with """I implement 'wormhole receive'. I return a Deferred that fires with
None (for success), or signals one of the following errors: None (for success), or signals one of the following errors:
* WrongPasswordError: the two sides didn't use matching passwords * WrongPasswordError: the two sides didn't use matching passwords
@ -33,7 +33,11 @@ def receive(args, reactor=reactor):
* TransferError: the sender rejected the transfer: verifier mismatch * TransferError: the sender rejected the transfer: verifier mismatch
* any other error: something unexpected happened * any other error: something unexpected happened
""" """
return Receiver(args, reactor).go() r = Receiver(args, reactor)
d = r.go()
if _debug_stash_wormhole is not None:
_debug_stash_wormhole.append(r._w)
return d
class Receiver: class Receiver:
@ -71,6 +75,8 @@ class Receiver:
tor_manager=self._tor_manager, tor_manager=self._tor_manager,
timing=self.args.timing, timing=self.args.timing,
welcome_handler=wh.handle_welcome) welcome_handler=wh.handle_welcome)
self._w = w # so tests can wait on events too
# I wanted to do this instead: # I wanted to do this instead:
# #
# try: # try: