summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pwd.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-06-30 22:57:08 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-06-30 22:57:08 (GMT)
commit5c8da86f3a515ce1a6d5f27fd15e3c5f4d8e931e (patch)
tree41f38aca16748628d53906337f06fdf087f52314 /Lib/test/test_pwd.py
parentbe96cf608fa656d7e53144cf85082ed5661e8c13 (diff)
downloadcpython-5c8da86f3a515ce1a6d5f27fd15e3c5f4d8e931e.zip
cpython-5c8da86f3a515ce1a6d5f27fd15e3c5f4d8e931e.tar.gz
cpython-5c8da86f3a515ce1a6d5f27fd15e3c5f4d8e931e.tar.bz2
convert usage of fail* to assert*
Diffstat (limited to 'Lib/test/test_pwd.py')
-rw-r--r--Lib/test/test_pwd.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py
index de4084e..fdc74b4 100644
--- a/Lib/test/test_pwd.py
+++ b/Lib/test/test_pwd.py
@@ -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, basestring))
+ self.assertTrue(isinstance(e.pw_name, basestring))
self.assertEqual(e[1], e.pw_passwd)
- self.assert_(isinstance(e.pw_passwd, basestring))
+ self.assertTrue(isinstance(e.pw_passwd, basestring))
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, basestring))
+ self.assertTrue(isinstance(e.pw_gecos, basestring))
self.assertEqual(e[5], e.pw_dir)
- self.assert_(isinstance(e.pw_dir, basestring))
+ self.assertTrue(isinstance(e.pw_dir, basestring))
self.assertEqual(e[6], e.pw_shell)
- self.assert_(isinstance(e.pw_shell, basestring))
+ self.assertTrue(isinstance(e.pw_shell, basestring))
# 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)