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

test_transit: fix py3.3, no %s in bytestrings

Browse Source
This commit is contained in:
Brian Warner 2015-12-02 03:02:50 -06:00
parent 8240d9e910
commit c103441648
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wormhole/test/test_transit.py
View File

@ -36,8 +36,8 @@ class Transit(ServerBase, unittest.TestCase):
a2 = yield connectProtocol(ep, Accumulator()) a2 = yield connectProtocol(ep, Accumulator())
token1 = b"\x00"*32 token1 = b"\x00"*32
a1.transport.write(b"please relay %s\n" % hexlify(token1)) a1.transport.write(b"please relay " + hexlify(token1) + b"\n")
a2.transport.write(b"please relay %s\n" % hexlify(token1)) a2.transport.write(b"please relay " + hexlify(token1) + b"\n")
# a correct handshake yields an ack, after which we can send # a correct handshake yields an ack, after which we can send
exp = b"ok\n" exp = b"ok\n"
@ -66,7 +66,7 @@ class Transit(ServerBase, unittest.TestCase):
token1 = b"\x00"*32 token1 = b"\x00"*32
# the server waits for the exact number of bytes in the expected # the server waits for the exact number of bytes in the expected
# handshake message. to trigger "bad handshake", we must match. # handshake message. to trigger "bad handshake", we must match.
a1.transport.write(b"please DELAY %s\n" % hexlify(token1)) a1.transport.write(b"please DELAY " + hexlify(token1) + b"\n")
exp = b"bad handshake\n" exp = b"bad handshake\n"
yield a1.waitForBytes(len(exp)) yield a1.waitForBytes(len(exp))
@ -81,7 +81,7 @@ class Transit(ServerBase, unittest.TestCase):
token1 = b"\x00"*32 token1 = b"\x00"*32
# sending too many bytes is impatience. # sending too many bytes is impatience.
a1.transport.write(b"please RELAY NOWNOW %s\n" % hexlify(token1)) a1.transport.write(b"please RELAY NOWNOW " + hexlify(token1) + b"\n")
exp = b"impatient\n" exp = b"impatient\n"
yield a1.waitForBytes(len(exp)) yield a1.waitForBytes(len(exp))