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

test_runner.py: Fix error in message arguments to 'fail' calls.

Browse Source
This commit is contained in:
david-sarah 2010-08-01 18:35:26 -07:00
parent 02199db615
commit 9aae9208e3
1 changed files with 6 additions and 6 deletions

12
src/allmydata/test/test_runner.py

@ -37,13 +37,13 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, SkipMixin):
d = utils.getProcessOutputAndValue(bintahoe, args=["--version-and-path"], env=os.environ)
def _cb(res):
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 0, str((out, err, rc_or_sig)))
self.failUnlessEqual(rc_or_sig, 0, str(res))
# Fail unless the 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 = "%s: %s (%s)" % (allmydata.__appname__, allmydata.__version__, ad)
self.failUnless(out.startswith(required_ver_and_path),
(out, err, rc_or_sig, required_ver_and_path))
str((out, err, rc_or_sig, required_ver_and_path)))
d.addCallback(_cb)
return d
@ -58,10 +58,10 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, SkipMixin):
d = utils.getProcessOutputAndValue(bintahoe, args=["--version"], env=os.environ)
def _cb(res):
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 0, res)
self.failUnless(out.startswith(allmydata.__appname__+':'), res)
self.failIfIn("DeprecationWarning", out, res)
self.failUnlessEqual(err, "", res)
self.failUnlessEqual(rc_or_sig, 0, str(res))
self.failUnless(out.startswith(allmydata.__appname__+':'), str(res))
self.failIfIn("DeprecationWarning", out, str(res))
self.failUnlessEqual(err, "", str(res))
d.addCallback(_cb)
return d