mirror of
https://github.com/python/cpython.git
synced 2025-10-15 03:10:29 +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
|
@ -491,7 +491,7 @@ class ProcessTestCase(unittest.TestCase):
|
|||
# but, based on system scheduling we can't control, it's possible
|
||||
# poll() never returned None. It "should be" very rare that it
|
||||
# didn't go around at least twice.
|
||||
self.assert_(count >= 2)
|
||||
self.assertTrue(count >= 2)
|
||||
# Subsequent invocations should just return the returncode
|
||||
self.assertEqual(p.poll(), 0)
|
||||
|
||||
|
@ -657,7 +657,7 @@ class ProcessTestCase(unittest.TestCase):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "input()"])
|
||||
|
||||
self.assert_(p.poll() is None, p.poll())
|
||||
self.assertTrue(p.poll() is None, p.poll())
|
||||
p.send_signal(signal.SIGINT)
|
||||
self.assertNotEqual(p.wait(), 0)
|
||||
|
||||
|
@ -665,7 +665,7 @@ class ProcessTestCase(unittest.TestCase):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "input()"])
|
||||
|
||||
self.assert_(p.poll() is None, p.poll())
|
||||
self.assertTrue(p.poll() is None, p.poll())
|
||||
p.kill()
|
||||
self.assertEqual(p.wait(), -signal.SIGKILL)
|
||||
|
||||
|
@ -673,7 +673,7 @@ class ProcessTestCase(unittest.TestCase):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "input()"])
|
||||
|
||||
self.assert_(p.poll() is None, p.poll())
|
||||
self.assertTrue(p.poll() is None, p.poll())
|
||||
p.terminate()
|
||||
self.assertEqual(p.wait(), -signal.SIGTERM)
|
||||
|
||||
|
@ -751,7 +751,7 @@ class ProcessTestCase(unittest.TestCase):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "input()"])
|
||||
|
||||
self.assert_(p.poll() is None, p.poll())
|
||||
self.assertTrue(p.poll() is None, p.poll())
|
||||
p.send_signal(signal.SIGTERM)
|
||||
self.assertNotEqual(p.wait(), 0)
|
||||
|
||||
|
@ -759,7 +759,7 @@ class ProcessTestCase(unittest.TestCase):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "input()"])
|
||||
|
||||
self.assert_(p.poll() is None, p.poll())
|
||||
self.assertTrue(p.poll() is None, p.poll())
|
||||
p.kill()
|
||||
self.assertNotEqual(p.wait(), 0)
|
||||
|
||||
|
@ -767,7 +767,7 @@ class ProcessTestCase(unittest.TestCase):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "input()"])
|
||||
|
||||
self.assert_(p.poll() is None, p.poll())
|
||||
self.assertTrue(p.poll() is None, p.poll())
|
||||
p.terminate()
|
||||
self.assertNotEqual(p.wait(), 0)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue