test_runner.py: tolerate symlinks in the source tree directory's ancestor path

This commit is contained in:
Brian Warner 2009-07-30 10:16:15 -07:00
parent 3782c27ac5
commit 0d0e0ba2fb

View File

@ -32,9 +32,12 @@ class TheRightCode(common_util.SignalMixin, unittest.TestCase,
out, err, rc_or_sig = res out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 0) self.failUnlessEqual(rc_or_sig, 0)
# Fail unless the allmydata-tahoe package is *this* version *and* was loaded from *this* source directory. # Fail unless the allmydata-tahoe package is *this* version *and*
required_ver_and_path = "allmydata-tahoe: %s (%s)" % (allmydata.__version__, os.path.dirname(os.path.dirname(allmydata.__file__))) # was loaded from *this* source directory.
self.failUnless(out.startswith(required_ver_and_path), (out, err, rc_or_sig, required_ver_and_path)) ad = os.path.dirname(os.path.dirname(os.path.realpath(allmydata.__file__)))
required_ver_and_path = "allmydata-tahoe: %s (%s)" % (allmydata.__version__, ad)
self.failUnless(out.startswith(required_ver_and_path),
(out, err, rc_or_sig, required_ver_and_path))
d.addCallback(_cb) d.addCallback(_cb)
return d return d