From 0d0e0ba2fb8998641689a3b972c2a99debfd80e1 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 30 Jul 2009 10:16:15 -0700 Subject: [PATCH] test_runner.py: tolerate symlinks in the source tree directory's ancestor path --- src/allmydata/test/test_runner.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index b436365d..74f1e115 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -32,9 +32,12 @@ class TheRightCode(common_util.SignalMixin, unittest.TestCase, out, err, rc_or_sig = res self.failUnlessEqual(rc_or_sig, 0) - # Fail unless the allmydata-tahoe package is *this* version *and* was loaded from *this* source directory. - required_ver_and_path = "allmydata-tahoe: %s (%s)" % (allmydata.__version__, os.path.dirname(os.path.dirname(allmydata.__file__))) - self.failUnless(out.startswith(required_ver_and_path), (out, err, rc_or_sig, required_ver_and_path)) + # Fail unless the allmydata-tahoe package is *this* version *and* + # was loaded from *this* source directory. + 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) return d -- 2.45.2