mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........
This commit is contained in:
parent
ef82be368a
commit
ab91fdef1f
274 changed files with 4538 additions and 4538 deletions
|
@ -130,7 +130,7 @@ class TestPkg(unittest.TestCase):
|
|||
self.assertEqual(subsub.__name__, "t2.sub.subsub")
|
||||
self.assertEqual(sub.subsub.__name__, "t2.sub.subsub")
|
||||
for name in ['spam', 'sub', 'subsub', 't2']:
|
||||
self.failUnless(locals()["name"], "Failed to import %s" % name)
|
||||
self.assertTrue(locals()["name"], "Failed to import %s" % name)
|
||||
|
||||
import t2.sub
|
||||
import t2.sub.subsub
|
||||
|
@ -140,7 +140,7 @@ class TestPkg(unittest.TestCase):
|
|||
|
||||
s = """
|
||||
from t2 import *
|
||||
self.failUnless(dir(), ['self', 'sub'])
|
||||
self.assertTrue(dir(), ['self', 'sub'])
|
||||
"""
|
||||
self.run_code(s)
|
||||
|
||||
|
@ -258,25 +258,25 @@ class TestPkg(unittest.TestCase):
|
|||
self.assertEqual(fixdir(dir(tas)),
|
||||
['__doc__', '__file__', '__name__',
|
||||
'__package__', '__path__'])
|
||||
self.failIf(t7)
|
||||
self.assertFalse(t7)
|
||||
from t7 import sub as subpar
|
||||
self.assertEqual(fixdir(dir(subpar)),
|
||||
['__doc__', '__file__', '__name__',
|
||||
'__package__', '__path__'])
|
||||
self.failIf(t7)
|
||||
self.failIf(sub)
|
||||
self.assertFalse(t7)
|
||||
self.assertFalse(sub)
|
||||
from t7.sub import subsub as subsubsub
|
||||
self.assertEqual(fixdir(dir(subsubsub)),
|
||||
['__doc__', '__file__', '__name__',
|
||||
'__package__', '__path__', 'spam'])
|
||||
self.failIf(t7)
|
||||
self.failIf(sub)
|
||||
self.failIf(subsub)
|
||||
self.assertFalse(t7)
|
||||
self.assertFalse(sub)
|
||||
self.assertFalse(subsub)
|
||||
from t7.sub.subsub import spam as ham
|
||||
self.assertEqual(ham, 1)
|
||||
self.failIf(t7)
|
||||
self.failIf(sub)
|
||||
self.failIf(subsub)
|
||||
self.assertFalse(t7)
|
||||
self.assertFalse(sub)
|
||||
self.assertFalse(subsub)
|
||||
|
||||
|
||||
def test_main():
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue