From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Fri, 24 Sep 2010 22:14:13 +0000 (+0000)
Subject: Merged revisions 85000 via svnmerge from
X-Git-Tag: v3.1.3rc1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a0eb98b9c41224f6ea8fd8f87687f79f723ba8c;p=python

Merged revisions 85000 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85000 | alexander.belopolsky | 2010-09-24 18:04:22 -0400 (Fri, 24 Sep 2010) | 1 line

  This should fix buildbot failure introduced by r84994
........
---

diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
index 20d036049b..99d6a12199 100644
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -307,6 +307,8 @@ class TestCoverage(unittest.TestCase):
         for line in stdout:
             lines, cov, module = line.split()[:3]
             coverage[module] = (int(lines), int(cov[:-1]))
+        # XXX This is needed to run regrtest.py as a script
+        modname = trace.fullmodname(sys.modules[modname].__file__)
         self.assertIn(modname, coverage)
         self.assertEqual(coverage[modname], (5, 100))