mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line #9424: Replace deprecated assert* methods in the Python test suite. ........
This commit is contained in:
parent
b65b4937e2
commit
19f2aeba67
164 changed files with 2281 additions and 2279 deletions
|
@ -203,10 +203,10 @@ class BasicSignalTests(unittest.TestCase):
|
|||
|
||||
def test_getsignal(self):
|
||||
hup = signal.signal(signal.SIGHUP, self.trivial_signal_handler)
|
||||
self.assertEquals(signal.getsignal(signal.SIGHUP),
|
||||
self.trivial_signal_handler)
|
||||
self.assertEqual(signal.getsignal(signal.SIGHUP),
|
||||
self.trivial_signal_handler)
|
||||
signal.signal(signal.SIGHUP, hup)
|
||||
self.assertEquals(signal.getsignal(signal.SIGHUP), hup)
|
||||
self.assertEqual(signal.getsignal(signal.SIGHUP), hup)
|
||||
|
||||
|
||||
@unittest.skipUnless(sys.platform == "win32", "Windows specific")
|
||||
|
@ -456,9 +456,9 @@ class ItimerTest(unittest.TestCase):
|
|||
"high")
|
||||
|
||||
# virtual itimer should be (0.0, 0.0) now
|
||||
self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0))
|
||||
self.assertEqual(signal.getitimer(self.itimer), (0.0, 0.0))
|
||||
# and the handler should have been called
|
||||
self.assertEquals(self.hndl_called, True)
|
||||
self.assertEqual(self.hndl_called, True)
|
||||
|
||||
# Issue 3864, unknown if this affects earlier versions of freebsd also
|
||||
@unittest.skipIf(sys.platform=='freebsd6',
|
||||
|
@ -479,7 +479,7 @@ class ItimerTest(unittest.TestCase):
|
|||
"high")
|
||||
|
||||
# profiling itimer should be (0.0, 0.0) now
|
||||
self.assertEquals(signal.getitimer(self.itimer), (0.0, 0.0))
|
||||
self.assertEqual(signal.getitimer(self.itimer), (0.0, 0.0))
|
||||
# and the handler should have been called
|
||||
self.assertEqual(self.hndl_called, True)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue