tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

test/test_runner.py: BinTahoe.test_path has rare nondeterministic failures; this patch probably fixes a problem where the actual cause of failure is masked by a string conversion error.

This commit is contained in:
david-sarah 2011-09-27 15:53:36 -07:00
parent 3a14ad1bb1
commit 5ba0529b87
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,14 +150,16 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, RunBinTahoeMixin):
"with a _version.py and 'setup.py darcsver' hasn't been run.") "with a _version.py and 'setup.py darcsver' hasn't been run.")
srcdir = os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(srcfile)))) srcdir = os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(srcfile))))
info = (res, allmydata.__appname__, required_verstr, srcdir) info = repr((res, allmydata.__appname__, required_verstr, srcdir))
appverpath = out.split(')')[0] appverpath = out.split(')')[0]
(appver, path) = appverpath.split(' (') (appver, path) = appverpath.split(' (')
(app, ver) = appver.split(': ') (app, ver) = appver.split(': ')
self.failUnlessEqual(app, allmydata.__appname__, info) self.failUnlessEqual(app, allmydata.__appname__, info)
self.failUnlessEqual(normalized_version(ver), normalized_version(required_verstr), info) norm_ver = normalized_version(ver)
norm_required = normalized_version(required_verstr)
self.failUnlessEqual(norm_ver, norm_required, info)
self.failUnlessEqual(path, srcdir, info) self.failUnlessEqual(path, srcdir, info)
d.addCallback(_cb) d.addCallback(_cb)
return d return d