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

u"" cleanup on test_scripts.py

Browse Source
This commit is contained in:
laharah 2016-06-04 14:03:05 -07:00
parent bb970dafc0
commit 150caedf73
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wormhole/test/common.py
View File

@ -1,3 +1,4 @@
# no unicode_literals untill twisted update
from twisted.application import service from twisted.application import service
from twisted.internet import reactor, defer from twisted.internet import reactor, defer
from twisted.python import log from twisted.python import log

18
src/wormhole/test/test_scripts.py
View File

@ -241,7 +241,7 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
common_args = ["--hide-progress", common_args = ["--hide-progress",
"--relay-url", self.relayurl, "--relay-url", self.relayurl,
"--transit-helper", ""] "--transit-helper", ""]
code = u"1-abc" code = "1-abc"
message = "test message" message = "test message"
send_args = common_args + [ send_args = common_args + [
@ -443,7 +443,7 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
common_args = ["--hide-progress", "--no-listen", common_args = ["--hide-progress", "--no-listen",
"--relay-url", self.relayurl, "--relay-url", self.relayurl,
"--transit-helper", ""] "--transit-helper", ""]
code = u"1-abc" code = "1-abc"
message = "test message" message = "test message"
send_args = common_args + [ "send", "--code", code ] send_args = common_args + [ "send", "--code", code ]
@ -527,7 +527,7 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
class NotWelcome(ServerBase, unittest.TestCase): class NotWelcome(ServerBase, unittest.TestCase):
def setUp(self): def setUp(self):
self._setup_relay(error=u"please upgrade XYZ") self._setup_relay(error="please upgrade XYZ")
@inlineCallbacks @inlineCallbacks
def test_sender(self): def test_sender(self):
@ -535,7 +535,7 @@ class NotWelcome(ServerBase, unittest.TestCase):
"--relay-url", self.relayurl, "--relay-url", self.relayurl,
"--transit-helper", ""] "--transit-helper", ""]
send_args = common_args + [ "send", "--text", "hi", send_args = common_args + [ "send", "--text", "hi",
"--code", u"1-abc" ] "--code", "1-abc" ]
sargs = runner.parser.parse_args(send_args) sargs = runner.parser.parse_args(send_args)
sargs.cwd = self.mktemp() sargs.cwd = self.mktemp()
sargs.stdout = io.StringIO() sargs.stdout = io.StringIO()
@ -551,7 +551,7 @@ class NotWelcome(ServerBase, unittest.TestCase):
common_args = ["--hide-progress", "--no-listen", common_args = ["--hide-progress", "--no-listen",
"--relay-url", self.relayurl, "--relay-url", self.relayurl,
"--transit-helper", ""] "--transit-helper", ""]
receive_args = common_args + [ "receive", u"1-abc" ] receive_args = common_args + [ "receive", "1-abc" ]
rargs = runner.parser.parse_args(receive_args) rargs = runner.parser.parse_args(receive_args)
rargs.cwd = self.mktemp() rargs.cwd = self.mktemp()
rargs.stdout = io.StringIO() rargs.stdout = io.StringIO()
@ -566,7 +566,7 @@ class Cleanup(ServerBase, unittest.TestCase):
@inlineCallbacks @inlineCallbacks
def test_text(self): def test_text(self):
# the rendezvous channel should be deleted after success # the rendezvous channel should be deleted after success
code = u"1-abc" code = "1-abc"
common_args = ["--hide-progress", common_args = ["--hide-progress",
"--relay-url", self.relayurl, "--relay-url", self.relayurl,
"--transit-helper", ""] "--transit-helper", ""]
@ -601,12 +601,12 @@ class Cleanup(ServerBase, unittest.TestCase):
sargs = runner.parser.parse_args(common_args + sargs = runner.parser.parse_args(common_args +
["send", ["send",
"--text", "secret message", "--text", "secret message",
"--code", u"1-abc"]) "--code", "1-abc"])
sargs.stdout = io.StringIO() sargs.stdout = io.StringIO()
sargs.stderr = io.StringIO() sargs.stderr = io.StringIO()
sargs.timing = DebugTiming() sargs.timing = DebugTiming()
rargs = runner.parser.parse_args(common_args + rargs = runner.parser.parse_args(common_args +
["receive", u"1-WRONG"]) ["receive", "1-WRONG"])
rargs.stdout = io.StringIO() rargs.stdout = io.StringIO()
rargs.stderr = io.StringIO() rargs.stderr = io.StringIO()
rargs.timing = DebugTiming() rargs.timing = DebugTiming()
@ -624,7 +624,7 @@ class Cleanup(ServerBase, unittest.TestCase):
class ExtractFile(unittest.TestCase): class ExtractFile(unittest.TestCase):
def test_filenames(self): def test_filenames(self):
args = mock.Mock() args = mock.Mock()
args.relay_url = u"" args.relay_url = ""
ef = cmd_receive.TwistedReceiver(args)._extract_file ef = cmd_receive.TwistedReceiver(args)._extract_file
extract_dir = os.path.abspath(self.mktemp()) extract_dir = os.path.abspath(self.mktemp())