[Python-checkins] cpython: Issue #12469: replace assertions by explicit if+raise

[victor.stinner]

http://hg.python.org/cpython/rev/7eef821ab20d
changeset:   71197:7eef821ab20d
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Mon Jul 04 18:06:35 2011 +0200
summary:
  Issue #12469: replace assertions by explicit if+raise

files:
  Lib/test/test_signal.py |  48 +++++++++++++++++++---------
  1 files changed, 32 insertions(+), 16 deletions(-)


diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -244,7 +244,8 @@
             # reliable)
             raised = set(raised)
             signals = set(signals)
-            assert raised == signals, "%r != %r" % (raised, signals)
+            if raised != signals:
+                raise Exception("%r != %r" % (raised, signals))
 
         {}
 
@@ -280,11 +281,13 @@
             time.sleep(TIMEOUT_FULL)
             mid_time = time.time()
             dt = mid_time - before_time
-            assert dt < TIMEOUT_HALF, dt
+            if dt >= TIMEOUT_HALF:
+                raise Exception("%s >= %s" % (dt, TIMEOUT_HALF))
             select.select([read], [], [], TIMEOUT_FULL)
             after_time = time.time()
             dt = after_time - mid_time
-            assert dt < TIMEOUT_HALF, dt
+            if dt >= TIMEOUT_HALF:
+                raise Exception("%s >= %s" % (dt, TIMEOUT_HALF))
         """, signal.SIGALRM)
 
     def test_wakeup_fd_during(self):
@@ -306,7 +309,8 @@
                 raise Exception("select.error not raised")
             after_time = time.time()
             dt = after_time - before_time
-            assert dt < TIMEOUT_HALF, dt
+            if dt >= TIMEOUT_HALF:
+                raise Exception("%s >= %s" % (dt, TIMEOUT_HALF))
         """, signal.SIGALRM)
 
     def test_signum(self):
@@ -540,7 +544,8 @@
             signal.pthread_sigmask(signal.SIG_BLOCK, [signum])
             os.kill(os.getpid(), signum)
             pending = signal.sigpending()
-            assert pending == {signum}, '%s != {%s}' % (pending, signum)
+            if pending != {signum}:
+                raise Exception('%s != {%s}' % (pending, signum))
             try:
                 signal.pthread_sigmask(signal.SIG_UNBLOCK, [signum])
             except ZeroDivisionError:
@@ -637,7 +642,8 @@
         def test(signum):
             signal.alarm(1)
             received = signal.sigwait([signum])
-            assert received == signum , 'received %s, not %s' % (received, signum)
+            if received != signum:
+                raise Exception('received %s, not %s' % (received, signum))
         ''')
 
     @unittest.skipUnless(hasattr(signal, 'sigwaitinfo'),
@@ -647,7 +653,8 @@
         def test(signum):
             signal.alarm(1)
             info = signal.sigwaitinfo([signum])
-            assert info.si_signo == signum, "info.si_signo != %s" % signum
+            if info.si_signo != signum:
+                raise Exception("info.si_signo != %s" % signum)
         ''')
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
@@ -657,7 +664,8 @@
         def test(signum):
             signal.alarm(1)
             info = signal.sigtimedwait([signum], (10, 1000))
-            assert info.si_signo == signum, 'info.si_signo != %s' % signum
+            if info.si_signo != signum:
+                raise Exception('info.si_signo != %s' % signum)
         ''')
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
@@ -672,7 +680,8 @@
             import os
             os.kill(os.getpid(), signum)
             info = signal.sigtimedwait([signum], (0, 0))
-            assert info.si_signo == signum, 'info.si_signo != %s' % signum
+            if info.si_signo != signum:
+                raise Exception('info.si_signo != %s' % signum)
         ''')
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
@@ -681,7 +690,8 @@
         self.wait_helper(signal.SIGALRM, '''
         def test(signum):
             received = signal.sigtimedwait([signum], (1, 0))
-            assert received is None, "received=%r" % (received,)
+            if received is not None:
+                raise Exception("received=%r" % (received,))
         ''')
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
@@ -709,7 +719,8 @@
                 signal.sigwaitinfo([signal.SIGUSR1])
             except OSError as e:
                 if e.errno == errno.EINTR:
-                    assert hndl_called, "SIGALRM handler not called"
+                    if not hndl_called:
+                        raise Exception("SIGALRM handler not called")
                 else:
                     raise Exception("Expected EINTR to be raised by sigwaitinfo")
             else:
@@ -796,8 +807,10 @@
 
         # Check the new mask
         blocked = read_sigmask()
-        assert signum in blocked, "%s not in %s" % (signum, blocked)
-        assert old_mask ^ blocked == {signum}, "%s ^ %s != {%s}" % (old_mask, blocked, signum)
+        if signum not in blocked:
+            raise Exception("%s not in %s" % (signum, blocked))
+        if old_mask ^ blocked != {signum}:
+            raise Exception("%s ^ %s != {%s}" % (old_mask, blocked, signum))
 
         # Unblock SIGUSR1
         try:
@@ -816,9 +829,12 @@
 
         # Check the new mask
         unblocked = read_sigmask()
-        assert signum not in unblocked, "%s in %s" % (signum, unblocked)
-        assert blocked ^ unblocked == {signum}, "%s ^ %s != {%s}" % (blocked, unblocked, signum)
-        assert old_mask == unblocked, "%s != %s" % (old_mask, unblocked)
+        if signum in unblocked:
+            raise Exception("%s in %s" % (signum, unblocked))
+        if blocked ^ unblocked != {signum}:
+            raise Exception("%s ^ %s != {%s}" % (blocked, unblocked, signum))
+        if old_mask != unblocked:
+            raise Exception("%s != %s" % (old_mask, unblocked))
         """
         assert_python_ok('-c', code)
 

-- 
Repository URL: http://hg.python.org/cpython