mirror of https://github.com/python/cpython.git
This test previously failed when run from the 'test' directory. In that
case, the test module created is actually a sub-package of 'test', thus the module is named 'test.areallylongpackage...' - this caused failure. Replace the hard-coded module names with __name__ attributes, which correctly reflects any hierarchy.
This commit is contained in:
parent
8834009338
commit
d800ae12f2
|
@ -194,7 +194,7 @@ def test_module(self):
|
||||||
touch(os.path.join(self.subpkgname, self.pkgname + os.extsep + 'py'))
|
touch(os.path.join(self.subpkgname, self.pkgname + os.extsep + 'py'))
|
||||||
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import areallylongpackageandmodulenametotestreprtruncation
|
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import areallylongpackageandmodulenametotestreprtruncation
|
||||||
eq(repr(areallylongpackageandmodulenametotestreprtruncation),
|
eq(repr(areallylongpackageandmodulenametotestreprtruncation),
|
||||||
"<module 'areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation' from '%s'>" % areallylongpackageandmodulenametotestreprtruncation.__file__)
|
"<module '%s' from '%s'>" % (areallylongpackageandmodulenametotestreprtruncation.__name__, areallylongpackageandmodulenametotestreprtruncation.__file__))
|
||||||
eq(repr(sys), "<module 'sys' (built-in)>")
|
eq(repr(sys), "<module 'sys' (built-in)>")
|
||||||
|
|
||||||
def test_type(self):
|
def test_type(self):
|
||||||
|
@ -205,7 +205,7 @@ class foo(object):
|
||||||
''')
|
''')
|
||||||
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import foo
|
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import foo
|
||||||
eq(repr(foo.foo),
|
eq(repr(foo.foo),
|
||||||
"<class 'areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation.foo.foo'>")
|
"<class '%s.foo'>" % foo.__name__)
|
||||||
|
|
||||||
def test_object(self):
|
def test_object(self):
|
||||||
# XXX Test the repr of a type with a really long tp_name but with no
|
# XXX Test the repr of a type with a really long tp_name but with no
|
||||||
|
@ -218,8 +218,9 @@ class bar:
|
||||||
pass
|
pass
|
||||||
''')
|
''')
|
||||||
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import bar
|
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import bar
|
||||||
|
# Module name may be prefixed with "test.", depending on how run.
|
||||||
self.failUnless(repr(bar.bar).startswith(
|
self.failUnless(repr(bar.bar).startswith(
|
||||||
"<class areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation.bar.bar at 0x"))
|
"<class %s.bar at 0x" % bar.__name__))
|
||||||
|
|
||||||
def test_instance(self):
|
def test_instance(self):
|
||||||
touch(os.path.join(self.subpkgname, 'baz'+os.extsep+'py'), '''\
|
touch(os.path.join(self.subpkgname, 'baz'+os.extsep+'py'), '''\
|
||||||
|
@ -229,7 +230,7 @@ class baz:
|
||||||
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import baz
|
from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import baz
|
||||||
ibaz = baz.baz()
|
ibaz = baz.baz()
|
||||||
self.failUnless(repr(ibaz).startswith(
|
self.failUnless(repr(ibaz).startswith(
|
||||||
"<areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation.baz.baz instance at 0x"))
|
"<%s.baz instance at 0x" % baz.__name__))
|
||||||
|
|
||||||
def test_method(self):
|
def test_method(self):
|
||||||
eq = self.assertEquals
|
eq = self.assertEquals
|
||||||
|
@ -244,7 +245,8 @@ def amethod(self): pass
|
||||||
# Bound method next
|
# Bound method next
|
||||||
iqux = qux.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()
|
iqux = qux.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()
|
||||||
self.failUnless(repr(iqux.amethod).startswith(
|
self.failUnless(repr(iqux.amethod).startswith(
|
||||||
'<bound method aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.amethod of <areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation.qux.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa instance at 0x'))
|
'<bound method aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.amethod of <%s.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa instance at 0x' \
|
||||||
|
% (qux.__name__,) ))
|
||||||
|
|
||||||
def test_builtin_function(self):
|
def test_builtin_function(self):
|
||||||
# XXX test built-in functions and methods with really long names
|
# XXX test built-in functions and methods with really long names
|
||||||
|
|
Loading…
Reference in New Issue