ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-16 15:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests that were incorrectly skipping due to not being able to find the 'tahoe' script.

Browse Source 
TODO: this may have broken testing "frozen" builds.
refs ticket:1582

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2016-02-16 18:40:07 +00:00
parent aa8a5be037
commit fe360ee47b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/allmydata/test/test_runner.py
View File

@ -34,16 +34,18 @@ rootdir = get_root_from_file(srcfile)
if hasattr(sys, 'frozen'):
bintahoe = os.path.join(rootdir, 'tahoe')
if sys.platform == "win32" and os.path.exists(bintahoe + '.exe'):
bintahoe += '.exe'
else:
bintahoe = os.path.join(rootdir, 'bin', 'tahoe')
if sys.platform == "win32":
bintahoe += '.pyscript'
if not os.path.exists(bintahoe):
alt_bintahoe = os.path.join(rootdir, 'Scripts', 'tahoe.pyscript')
if os.path.exists(alt_bintahoe):
bintahoe = alt_bintahoe
if sys.platform == "win32" and not os.path.exists(bintahoe):
scriptsdir = os.path.join(rootdir, 'Scripts')
for alt_bintahoe in (bintahoe + '.pyscript',
bintahoe + '-script.py',
os.path.join(scriptsdir, 'tahoe.pyscript'),
os.path.join(scriptsdir, 'tahoe-script.py'),):
if os.path.exists(alt_bintahoe):
bintahoe = alt_bintahoe
break
class RunBinTahoeMixin: