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

test_scripts: wormhole should live next to python

Browse Source 
not necessarily beneath the current working directory
This commit is contained in:
Brian Warner 2015-09-26 18:29:46 -07:00
parent d3ef3aa29a
commit adf55175fb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import os import os, sys
from twisted.trial import unittest from twisted.trial import unittest
from twisted.python import procutils, log from twisted.python import procutils, log
from twisted.internet.utils import getProcessOutputAndValue from twisted.internet.utils import getProcessOutputAndValue
@ -9,16 +9,19 @@ class Scripts(ServerBase, unittest.TestCase):
# we need Twisted to run the server, but we run the sender and receiver # we need Twisted to run the server, but we run the sender and receiver
# with deferToThread() # with deferToThread()
def find_executable(self): def find_executable(self):
# to make sure we're running the right executable (in a virtualenv),
# we require that our "wormhole" lives in the same directory as our
# "python"
locations = procutils.which("wormhole") locations = procutils.which("wormhole")
if not locations: if not locations:
raise unittest.SkipTest("unable to find 'wormhole' in $PATH") raise unittest.SkipTest("unable to find 'wormhole' in $PATH")
wormhole = locations[0] wormhole = locations[0]
here = os.path.dirname(os.path.abspath(".")) if (os.path.dirname(os.path.abspath(wormhole)) !=
if not os.path.abspath(wormhole).startswith(here): os.path.dirname(sys.executable)):
log.msg("locations: %s" % (locations,)) log.msg("locations: %s" % (locations,))
log.msg("here: %s" % (here,)) log.msg("sys.executable: %s" % (sys.executable,))
raise unittest.SkipTest("found the wrong 'wormhole' in $PATH: %s %s" raise unittest.SkipTest("found the wrong 'wormhole' in $PATH: %s %s"
% (wormhole, here)) % (wormhole, sys.executable))
return wormhole return wormhole
def test_version(self): def test_version(self):