ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 13:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

test_runner.py: fix spurious failures of test_path on case-insensitive filesystems, and restore the check that the version is not 'unknown'.

Browse Source
This commit is contained in:
david-sarah 2010-09-11 15:19:13 -07:00
parent 31f66c5470
commit b23a7fcc10
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,10 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, SkipMixin):
verstr = str(allmydata.__version__)
self.failIfEqual(verstr, "unknown",
"We don't know our version, because this distribution didn't come "
"with a _version.py and 'setup.py darcsver' hasn't been run.")
# The Python "rational version numbering" convention
# disallows "-r$REV" but allows ".post$REV"
# instead. Eventually we'll probably move to that. When we
@ -101,10 +105,8 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, SkipMixin):
else:
altverstr = verstr
ad = os.path.dirname(os.path.dirname(os.path.realpath(allmydata.__file__)))
required_ver_and_path = "%s: %s (%s)" % (allmydata.__appname__, verstr, ad)
alt_required_ver_and_path = "%s: %s (%s)" % (allmydata.__appname__, altverstr, ad)
required_ver_and_path = "%s: %s (%s)" % (allmydata.__appname__, verstr, srcdir)
alt_required_ver_and_path = "%s: %s (%s)" % (allmydata.__appname__, altverstr, srcdir)
self.failUnless(out.startswith(required_ver_and_path) or out.startswith(alt_required_ver_and_path), (out, err, rc_or_sig, required_ver_and_path))
d.addCallback(_cb)