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

tests: handle argparse on py3.3

Browse Source 
which sends --version to stderr, not stdout. This might make the py3.3
tests pass.
This commit is contained in:
Brian Warner 2015-09-28 16:31:35 -07:00
parent 4cd838f410
commit 336eea5e78
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,26 +50,22 @@ class ScriptVersion(ServerBase, ScriptsBase, unittest.TestCase):
def test_version(self): def test_version(self):
# "wormhole" must be on the path, so e.g. "pip install -e ." in a # "wormhole" must be on the path, so e.g. "pip install -e ." in a
# virtualenv # virtualenv. This guards against an environment where the tests
# below might run the wrong executable.
wormhole = self.find_executable() wormhole = self.find_executable()
d = getProcessOutputAndValue(wormhole, ["--version"]) d = getProcessOutputAndValue(wormhole, ["--version"])
def _check(res): def _check(res):
out, err, rc = res out, err, rc = res
# argparse on py2 sends --version to stderr # argparse on py2 and py3.3 sends --version to stderr
# argparse on py3 sends --version to stdout # argparse on py3.4/py3.5 sends --version to stdout
# aargh # aargh
out = out.decode("utf-8")
err = err.decode("utf-8") err = err.decode("utf-8")
if "DistributionNotFound" in err: if "DistributionNotFound" in err:
log.msg("stderr was %s" % err) log.msg("stderr was %s" % err)
last = err.strip().split("\n")[-1] last = err.strip().split("\n")[-1]
self.fail("wormhole not runnable: %s" % last) self.fail("wormhole not runnable: %s" % last)
if sys.version_info[0] == 2: ver = out.decode("utf-8") or err
self.failUnlessEqual(out, "") self.failUnlessEqual(ver, "magic-wormhole %s\n" % __version__)
self.failUnlessEqual(err, "magic-wormhole %s\n" % __version__)
else:
self.failUnlessEqual(err, "")
self.failUnlessEqual(out, "magic-wormhole %s\n" % __version__)
self.failUnlessEqual(rc, 0) self.failUnlessEqual(rc, 0)
d.addCallback(_check) d.addCallback(_check)
return d return d