[Python-checkins] cpython (merge 3.2 -> default): Backout change e8f44ebacda7052267318cecf5b6f128d35add17. Reverting the test

[gregory.p.smith]

http://hg.python.org/cpython/rev/b4ae7aa21b46
changeset:   77764:b4ae7aa21b46
parent:      77761:485a4f4ad08d
parent:      77763:95b071194ddd
user:        Gregory P. Smith <greg at krypto.org>
date:        Mon Jun 25 01:15:14 2012 -0700
summary:
  Backout change e8f44ebacda7052267318cecf5b6f128d35add17.  Reverting the test
to using signal.alarm(1) instead of signal.setitimer(signal.ITIMER_REAL, 0.1).

This is an attempt to see if this change is what caused the ubuntu arm buildbot
to hang in test_io's test_interrupted_write_retry_text.
Discussion in Issue #12268.

files:
  Lib/test/test_io.py |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2912,7 +2912,7 @@
         try:
             wio = self.io.open(w, **fdopen_kwargs)
             t.start()
-            signal.setitimer(signal.ITIMER_REAL, 0.1)
+            signal.alarm(1)
             # Fill the pipe enough that the write will be blocking.
             # It will be interrupted by the timer armed above.  Since the
             # other thread has read one byte, the low-level write will
@@ -2957,7 +2957,7 @@
         r, w = os.pipe()
         wio = self.io.open(w, **fdopen_kwargs)
         try:
-            signal.setitimer(signal.ITIMER_REAL, 0.1)
+            signal.alarm(1)
             # Either the reentrant call to wio.write() fails with RuntimeError,
             # or the signal handler raises ZeroDivisionError.
             with self.assertRaises((ZeroDivisionError, RuntimeError)) as cm:
@@ -2992,7 +2992,7 @@
         try:
             rio = self.io.open(r, **fdopen_kwargs)
             os.write(w, b"foo")
-            signal.setitimer(signal.ITIMER_REAL, 0.1)
+            signal.alarm(1)
             # Expected behaviour:
             # - first raw read() returns partial b"foo"
             # - second raw read() returns EINTR
@@ -3036,13 +3036,13 @@
         t.daemon = True
         def alarm1(sig, frame):
             signal.signal(signal.SIGALRM, alarm2)
-            signal.setitimer(signal.ITIMER_REAL, 0.1)
+            signal.alarm(1)
         def alarm2(sig, frame):
             t.start()
         signal.signal(signal.SIGALRM, alarm1)
         try:
             wio = self.io.open(w, **fdopen_kwargs)
-            signal.setitimer(signal.ITIMER_REAL, 0.1)
+            signal.alarm(1)
             # Expected behaviour:
             # - first raw write() is partial (because of the limited pipe buffer
             #   and the first alarm)

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