Ticket #14152: 14152_sig_on_check.patch

sage/all.py

@@ -72 +72 @@
 
 ###################################################################
 
-from sage.ext.c_lib import _init_csage, sig_on_count
-_init_csage()
+import sage.ext.c_lib
+sage.ext.c_lib._init_csage()
+sig_on_count = sage.ext.c_lib._sig_on_reset
 
 from time                import sleep
 

sage/doctest/sources.py

@@ -674 +674 @@
             There are 12 tests in sage/combinat/tableau.py that are not being run
             There are 3 unexpected tests being run in sage/doctest/parsing.py
             There are 1 unexpected tests being run in sage/doctest/reporting.py
-            There are 1 tests in sage/ext/c_lib.pyx that are not being run
             There are 9 tests in sage/graphs/graph_plot.py that are not being run
             There are 2 tests in sage/server/notebook/worksheet.py that are not being run
             doctest:229: UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal

sage/doctest/test.py

@@ -209 +209 @@
     ...
     16
 
+Test that ``sig_on_count`` is checked correctly::
+
+    sage: subprocess.call(["sage", "-t", "sig_on.rst"], **kwds)  # long time
+    Running doctests...
+    Doctesting 1 file.
+    sage -t sig_on.rst
+    **********************************************************************
+    File "sig_on.rst", line 5, in sage.doctest.tests.sig_on
+    Failed example:
+        sig_on_count()
+    Expected:
+        0
+    Got:
+        1
+    **********************************************************************
+    1 item had failures:
+       1 of   4 in sage.doctest.tests.sig_on
+        [2 tests, 1 failure, ...]
+    ----------------------------------------------------------------------
+    sage -t sig_on.rst  # 1 doctest failed
+    ----------------------------------------------------------------------
+    ...
+    1
+
 Test the ``--debug`` option::
 
     sage: subprocess.call(["sage", "-t", "--debug", "simple_failure.rst"], stdin=open(os.devnull), **kwds)  # long time

new file sage/doctest/tests/sig_on.rst

@@ +1 @@
+Test a bad value of ``sig_on_count``::
+
+    sage: cython('sig_on()')
+
+The following test should succees as usual::
+
+    sage: 3**12 - 2**19
+    7153

sage/ext/c_lib.pyx

@@ -43 +43 @@
     init_csage()
 
 
-def sig_on_count():
+def _sig_on_reset():
     """
-    Return _signals.sig_on_count.
-
-    This is normally zero, but increased by every sig_on() or sig_str()
-    and decreased by every sig_off(). In pure Python code, this should
-    always be zero.
+    Return the current value of ``_signals.sig_on_count`` and set its
+    value to zero. This is used by the doctesting framework.
 
     EXAMPLES::
 
-        sage: sig_on_count()
+        sage: from sage.ext.c_lib import _sig_on_reset as sig_on_reset
+        sage: cython('sig_on()'); sig_on_reset()
+        1
+        sage: sig_on_reset()
         0
     """
-    return _signals.sig_on_count
+    cdef int s = _signals.sig_on_count
+    _signals.sig_on_count = 0
+    return s
 
 
 def sage_python_check_interrupt(sig, frame):