test_runner.py: fix error in BinTahoe.test_version_no_noise introduced by last patch...

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 7b6d7966f35b21b9813f194dde6e20be10f55c0a..f020b82b961a0db579567a9c62b3b743fe41a3bb 100644 (file)
--- 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)