[Python-checkins] cpython: Try to fix or diagnose buildbot failures
antoine.pitrou
python-checkins at python.org
Thu Jul 12 19:23:32 CEST 2012
http://hg.python.org/cpython/rev/85083e50c717
changeset: 78064:85083e50c717
user: Antoine Pitrou <solipsis at pitrou.net>
date: Thu Jul 12 19:21:43 2012 +0200
summary:
Try to fix or diagnose buildbot failures
files:
Lib/test/test_import.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -194,6 +194,7 @@
# New in 2.4, we shouldn't be able to import that no matter how often
# we try.
sys.path.insert(0, os.curdir)
+ importlib.invalidate_caches()
if TESTFN in sys.modules:
del sys.modules[TESTFN]
try:
@@ -465,7 +466,11 @@
unc += path[2:]
sys.path.append(unc)
try:
- mod = __import__("test_trailing_slash")
+ try:
+ mod = __import__("test_trailing_slash")
+ except ImportError as e:
+ self.fail("could not import 'test_trailing_slash' from %r: %r"
+ % (unc, e))
self.assertEqual(mod.testdata, 'test_trailing_slash')
unload("test_trailing_slash")
finally:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list