From: david-sarah <david-sarah@jacaranda.org>
Date: Fri, 29 Oct 2010 22:11:23 +0000 (-0700)
Subject: test_runner.py: fix error in BinTahoe.test_version_no_noise introduced by last patch... 
X-Git-Tag: trac-4800~24
X-Git-Url: https://git.rkrishnan.org/simplejson/components/COPYING.TGPPL.html?a=commitdiff_plain;h=10a5f23df910493be537a15ac43c126381b2eb43;p=tahoe-lafs%2Ftahoe-lafs.git

test_runner.py: fix error in BinTahoe.test_version_no_noise introduced by last patch. refs #1235
---

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 7b6d7966..f020b82b 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -159,7 +159,7 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, SkipMixin):
             self.failIfIn("DeprecationWarning", out, str(res))
             errlines = err.split("\n")
             self.failIf([True for line in errlines if (line != "" and "UserWarning: Unbuilt egg for setuptools" not in line
-                                                                  and "from pkg_resources import load_entry_point" not in line)], errstr)
+                                                                  and "from pkg_resources import load_entry_point" not in line)], str(res))
             if err != "":
                 raise unittest.SkipTest("This test is known not to pass on Ubuntu Lucid; see #1235.")
         d.addCallback(_cb)