From: david-sarah Date: Fri, 29 Oct 2010 20:42:46 +0000 (-0700) Subject: test_runner.py: also allow 'from pkg_resources import load_entry_point' as noise... X-Git-Tag: trac-4800~25 X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/frontends/index.php?a=commitdiff_plain;h=d249589667367877a47e03aa40d9ce289c4edb00;p=tahoe-lafs%2Ftahoe-lafs.git test_runner.py: also allow 'from pkg_resources import load_entry_point' as noise. refs #1235. --- diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index f5d30d5d..7b6d7966 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -158,7 +158,8 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, SkipMixin): self.failUnless(out.startswith(allmydata.__appname__+':'), str(res)) 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)], str(res)) + 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) if err != "": raise unittest.SkipTest("This test is known not to pass on Ubuntu Lucid; see #1235.") d.addCallback(_cb) @@ -443,7 +444,8 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin, self.failUnlessEqual(rc_or_sig, 0, errstr) self.failUnlessEqual(out, "", errstr) # If you emit noise, you fail this test. errlines = err.split("\n") - self.failIf([True for line in errlines if line != "" and ("UserWarning: Unbuilt egg for setuptools" not in line)], errstr) + 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) if err != "": raise unittest.SkipTest("This test is known not to pass on Ubuntu Lucid; see #1235.")