mirror of
https://github.com/python/cpython.git
synced 2025-07-23 03:05:38 +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
|
@ -13,19 +13,19 @@ class PwdTest(unittest.TestCase):
|
|||
for e in entries:
|
||||
self.assertEqual(len(e), 7)
|
||||
self.assertEqual(e[0], e.pw_name)
|
||||
self.assert_(isinstance(e.pw_name, str))
|
||||
self.assertTrue(isinstance(e.pw_name, str))
|
||||
self.assertEqual(e[1], e.pw_passwd)
|
||||
self.assert_(isinstance(e.pw_passwd, str))
|
||||
self.assertTrue(isinstance(e.pw_passwd, str))
|
||||
self.assertEqual(e[2], e.pw_uid)
|
||||
self.assert_(isinstance(e.pw_uid, int))
|
||||
self.assertTrue(isinstance(e.pw_uid, int))
|
||||
self.assertEqual(e[3], e.pw_gid)
|
||||
self.assert_(isinstance(e.pw_gid, int))
|
||||
self.assertTrue(isinstance(e.pw_gid, int))
|
||||
self.assertEqual(e[4], e.pw_gecos)
|
||||
self.assert_(isinstance(e.pw_gecos, str))
|
||||
self.assertTrue(isinstance(e.pw_gecos, str))
|
||||
self.assertEqual(e[5], e.pw_dir)
|
||||
self.assert_(isinstance(e.pw_dir, str))
|
||||
self.assertTrue(isinstance(e.pw_dir, str))
|
||||
self.assertEqual(e[6], e.pw_shell)
|
||||
self.assert_(isinstance(e.pw_shell, str))
|
||||
self.assertTrue(isinstance(e.pw_shell, str))
|
||||
|
||||
# The following won't work, because of duplicate entries
|
||||
# for one uid
|
||||
|
@ -43,8 +43,8 @@ class PwdTest(unittest.TestCase):
|
|||
for e in entries:
|
||||
if not e[0] or e[0] == '+':
|
||||
continue # skip NIS entries etc.
|
||||
self.assert_(pwd.getpwnam(e.pw_name) in entriesbyname[e.pw_name])
|
||||
self.assert_(pwd.getpwuid(e.pw_uid) in entriesbyuid[e.pw_uid])
|
||||
self.assertTrue(pwd.getpwnam(e.pw_name) in entriesbyname[e.pw_name])
|
||||
self.assertTrue(pwd.getpwuid(e.pw_uid) in entriesbyuid[e.pw_uid])
|
||||
|
||||
def test_errors(self):
|
||||
self.assertRaises(TypeError, pwd.getpwuid)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue