[pypy-svn] pypy default: loosen the test a little, and only check that the missing component is mentioned in the ImportError message

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r41948:3501a4c13d85
Date: 2011-02-15 11:48 +0100
http://bitbucket.org/pypy/pypy/changeset/3501a4c13d85/

Log:	loosen the test a little, and only check that the missing component
	is mentioned in the ImportError message

diff --git a/lib-python/modified-2.7.0/test/test_pydoc.py b/lib-python/modified-2.7.0/test/test_pydoc.py
--- a/lib-python/modified-2.7.0/test/test_pydoc.py
+++ b/lib-python/modified-2.7.0/test/test_pydoc.py
@@ -265,8 +265,8 @@
         testpairs = (
             ('i_am_not_here', 'i_am_not_here'),
             ('test.i_am_not_here_either', 'i_am_not_here_either'),
-            ('test.i_am_not_here.neither_am_i', 'i_am_not_here.neither_am_i'),
-            ('i_am_not_here.{}'.format(modname), 'i_am_not_here.{}'.format(modname)),
+            ('test.i_am_not_here.neither_am_i', 'i_am_not_here'),
+            ('i_am_not_here.{}'.format(modname), 'i_am_not_here'),
             ('test.{}'.format(modname), modname),
             )
 
@@ -290,8 +290,8 @@
                     result = run_pydoc(modname)
                 finally:
                     forget(modname)
-                expected = badimport_pattern % (modname, expectedinmsg)
-                self.assertEqual(expected, result)
+                expected = badimport_pattern % (modname, '(.+\\.)?' + expectedinmsg + '(\\..+)?$')
+                self.assertTrue(re.match(expected, result))
 
     def test_input_strip(self):
         missing_module = " test.i_am_not_here "