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

fix tests on windows

Browse Source
This commit is contained in:
Brian Warner 2016-12-10 16:14:54 -08:00
parent f3e1aab3a1
commit 5c751eb3ed
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,8 +473,10 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
if mode == "file": if mode == "file":
message = "test message\n" message = "test message\n"
send_cfg.what = receive_name = send_filename = "testfile" send_cfg.what = receive_name = send_filename = "testfile"
with open(os.path.join(send_dir, send_filename), "w") as f: fn = os.path.join(send_dir, send_filename)
with open(fn, "w") as f:
f.write(message) f.write(message)
size = os.stat(fn).st_size
elif mode == "directory": elif mode == "directory":
# $send_dir/ # $send_dir/
@ -484,12 +486,14 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
# cd $receive_dir && wormhole receive # cd $receive_dir && wormhole receive
# expect: $receive_dir/$dirname/[12345] # expect: $receive_dir/$dirname/[12345]
size = 0
send_cfg.what = receive_name = send_dirname = "testdir" send_cfg.what = receive_name = send_dirname = "testdir"
os.mkdir(os.path.join(send_dir, send_dirname)) os.mkdir(os.path.join(send_dir, send_dirname))
for i in range(5): for i in range(5):
path = os.path.join(send_dir, send_dirname, str(i)) path = os.path.join(send_dir, send_dirname, str(i))
with open(path, "w") as f: with open(path, "w") as f:
f.write("test message %d\n" % i) f.write("test message %d\n" % i)
size += os.stat(path).st_size
if failmode == "noclobber": if failmode == "noclobber":
PRESERVE = "don't clobber me\n" PRESERVE = "don't clobber me\n"
@ -534,7 +538,7 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
# check sender # check sender
if mode == "file": if mode == "file":
self.failUnlessIn("Sending {size:s} file named '{name}'{NL}" self.failUnlessIn("Sending {size:s} file named '{name}'{NL}"
.format(size=naturalsize(len(message)), .format(size=naturalsize(size),
name=send_filename, name=send_filename,
NL=NL), send_stdout) NL=NL), send_stdout)
self.failUnlessIn("On the other computer, please run: " self.failUnlessIn("On the other computer, please run: "
@ -565,8 +569,8 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
.format(NL=NL), receive_stdout) .format(NL=NL), receive_stdout)
else: else:
self.failUnlessIn("Error: " self.failUnlessIn("Error: "
"insufficient free space (0B) for file (13B){NL}" "insufficient free space (0B) for file ({size:d}B){NL}"
.format(NL=NL), receive_stdout) .format(NL=NL, size=size), receive_stdout)
elif mode == "directory": elif mode == "directory":
self.failIfIn("Received files written to {name}" self.failIfIn("Received files written to {name}"
.format(name=receive_name), receive_stdout) .format(name=receive_name), receive_stdout)
@ -580,8 +584,8 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
.format(NL=NL), receive_stdout) .format(NL=NL), receive_stdout)
else: else:
self.failUnlessIn("Error: " self.failUnlessIn("Error: "
"insufficient free space (0B) for directory (75B){NL}" "insufficient free space (0B) for directory ({size:d}B){NL}"
.format(NL=NL), receive_stdout) .format(NL=NL, size=size), receive_stdout)
if failmode == "noclobber": if failmode == "noclobber":
fn = os.path.join(receive_dir, receive_name) fn = os.path.join(receive_dir, receive_name)

2
src/wormhole/test/test_util.py
View File

@ -42,7 +42,7 @@ class Utils(unittest.TestCase):
class Space(unittest.TestCase): class Space(unittest.TestCase):
def test_free_space(self): def test_free_space(self):
free = util.estimate_free_space(".") free = util.estimate_free_space(".")
self.assert_(isinstance(free, (int, None)), free) self.assert_(isinstance(free, (int, type(None))), repr(free))
# some platforms (I think the VMs used by travis are in this # some platforms (I think the VMs used by travis are in this
# category) return 0, and windows will return None, so don't assert # category) return 0, and windows will return None, so don't assert
# anything more specific about the return value # anything more specific about the return value