mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Backout change e8f44ebacda7052267318cecf5b6f128d35add17. Reverting the test

Browse source 
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.
This commit is contained in:
Gregory P. Smith 2012-06-25 01:13:32 -07:00
parent 33369cf9a5
commit b5ba203709
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_io.py
View file

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