mirror of
https://github.com/python/cpython.git
synced 2025-11-01 14:11:41 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk ........ r53545 | andrew.kuchling | 2007-01-24 21:06:41 +0100 (Wed, 24 Jan 2007) | 1 line Strengthen warning about using lock() ........ r53556 | thomas.heller | 2007-01-25 19:34:14 +0100 (Thu, 25 Jan 2007) | 3 lines Fix for #1643874: When calling SysAllocString, create a PyCObject which will eventually call SysFreeString to free the BSTR resource. ........ r53563 | andrew.kuchling | 2007-01-25 21:02:13 +0100 (Thu, 25 Jan 2007) | 1 line Add item ........ r53564 | brett.cannon | 2007-01-25 21:22:02 +0100 (Thu, 25 Jan 2007) | 8 lines Fix time.strptime's %U support. Basically rewrote the algorithm to be more generic so that one only has to shift certain values based on whether the week was specified to start on Monday or Sunday. Cut out a lot of edge case code compared to the previous version. Also broke algorithm out into its own function (that is private to the module). Fixes bug #1643943 (thanks Biran Nahas for the report). ........ r53570 | brett.cannon | 2007-01-26 00:30:39 +0100 (Fri, 26 Jan 2007) | 4 lines Remove specific mention of my name and email address from modules. Not really needed and all bug reports should go to the bug tracker, not directly to me. Plus I am not the only person to have edited these files at this point. ........ r53573 | fred.drake | 2007-01-26 17:28:44 +0100 (Fri, 26 Jan 2007) | 1 line fix typo (extraneous ")") ........ r53575 | georg.brandl | 2007-01-27 18:43:02 +0100 (Sat, 27 Jan 2007) | 4 lines Patch #1638243: the compiler package is now able to correctly compile a with statement; previously, executing code containing a with statement compiled by the compiler package crashed the interpreter. ........ r53578 | georg.brandl | 2007-01-27 18:59:42 +0100 (Sat, 27 Jan 2007) | 3 lines Patch #1634778: add missing encoding aliases for iso8859_15 and iso8859_16. ........ r53579 | georg.brandl | 2007-01-27 20:38:50 +0100 (Sat, 27 Jan 2007) | 2 lines Bug #1645944: os.access now returns bool but docstring is not updated ........ r53590 | brett.cannon | 2007-01-28 21:58:00 +0100 (Sun, 28 Jan 2007) | 2 lines Use the thread lock's context manager instead of a try/finally statement. ........ r53591 | brett.cannon | 2007-01-29 05:41:44 +0100 (Mon, 29 Jan 2007) | 2 lines Add a test for slicing an exception. ........ r53594 | andrew.kuchling | 2007-01-29 21:21:43 +0100 (Mon, 29 Jan 2007) | 1 line Minor edits to the curses HOWTO ........ r53596 | andrew.kuchling | 2007-01-29 21:55:40 +0100 (Mon, 29 Jan 2007) | 1 line Various minor edits ........ r53597 | andrew.kuchling | 2007-01-29 22:28:48 +0100 (Mon, 29 Jan 2007) | 1 line More edits ........ r53601 | tim.peters | 2007-01-30 04:03:46 +0100 (Tue, 30 Jan 2007) | 2 lines Whitespace normalization. ........ r53603 | georg.brandl | 2007-01-30 21:21:30 +0100 (Tue, 30 Jan 2007) | 2 lines Bug #1648191: typo in docs. ........ r53605 | brett.cannon | 2007-01-30 22:34:36 +0100 (Tue, 30 Jan 2007) | 8 lines No more raising of string exceptions! The next step of PEP 352 (for 2.6) causes raising a string exception to trigger a TypeError. Trying to catch a string exception raises a DeprecationWarning. References to string exceptions has been removed from the docs since they are now just an error. ........ r53618 | raymond.hettinger | 2007-02-01 22:02:59 +0100 (Thu, 01 Feb 2007) | 1 line Bug #1648179: set.update() not recognizing __iter__ overrides in dict subclasses. ........
147 lines
4.7 KiB
Python
147 lines
4.7 KiB
Python
import pty, os, sys, signal
|
|
from test.test_support import verbose, TestFailed, TestSkipped
|
|
|
|
TEST_STRING_1 = "I wish to buy a fish license.\n"
|
|
TEST_STRING_2 = "For my pet fish, Eric.\n"
|
|
|
|
if verbose:
|
|
def debug(msg):
|
|
print msg
|
|
else:
|
|
def debug(msg):
|
|
pass
|
|
|
|
def normalize_output(data):
|
|
# Some operating systems do conversions on newline. We could possibly
|
|
# fix that by doing the appropriate termios.tcsetattr()s. I couldn't
|
|
# figure out the right combo on Tru64 and I don't have an IRIX box.
|
|
# So just normalize the output and doc the problem O/Ses by allowing
|
|
# certain combinations for some platforms, but avoid allowing other
|
|
# differences (like extra whitespace, trailing garbage, etc.)
|
|
|
|
# This is about the best we can do without getting some feedback
|
|
# from someone more knowledgable.
|
|
|
|
# OSF/1 (Tru64) apparently turns \n into \r\r\n.
|
|
if data.endswith('\r\r\n'):
|
|
return data.replace('\r\r\n', '\n')
|
|
|
|
# IRIX apparently turns \n into \r\n.
|
|
if data.endswith('\r\n'):
|
|
return data.replace('\r\n', '\n')
|
|
|
|
return data
|
|
|
|
# Marginal testing of pty suite. Cannot do extensive 'do or fail' testing
|
|
# because pty code is not too portable.
|
|
|
|
def test_basic_pty():
|
|
try:
|
|
debug("Calling master_open()")
|
|
master_fd, slave_name = pty.master_open()
|
|
debug("Got master_fd '%d', slave_name '%s'"%(master_fd, slave_name))
|
|
debug("Calling slave_open(%r)"%(slave_name,))
|
|
slave_fd = pty.slave_open(slave_name)
|
|
debug("Got slave_fd '%d'"%slave_fd)
|
|
except OSError:
|
|
# " An optional feature could not be imported " ... ?
|
|
raise TestSkipped, "Pseudo-terminals (seemingly) not functional."
|
|
|
|
if not os.isatty(slave_fd):
|
|
raise TestFailed, "slave_fd is not a tty"
|
|
|
|
debug("Writing to slave_fd")
|
|
os.write(slave_fd, TEST_STRING_1)
|
|
s1 = os.read(master_fd, 1024)
|
|
sys.stdout.write(normalize_output(s1))
|
|
|
|
debug("Writing chunked output")
|
|
os.write(slave_fd, TEST_STRING_2[:5])
|
|
os.write(slave_fd, TEST_STRING_2[5:])
|
|
s2 = os.read(master_fd, 1024)
|
|
sys.stdout.write(normalize_output(s2))
|
|
|
|
os.close(slave_fd)
|
|
os.close(master_fd)
|
|
|
|
def handle_sig(sig, frame):
|
|
raise TestFailed, "isatty hung"
|
|
|
|
# isatty() and close() can hang on some platforms
|
|
# set an alarm before running the test to make sure we don't hang forever
|
|
old_alarm = signal.signal(signal.SIGALRM, handle_sig)
|
|
signal.alarm(10)
|
|
|
|
try:
|
|
test_basic_pty()
|
|
finally:
|
|
# remove alarm, restore old alarm handler
|
|
signal.alarm(0)
|
|
signal.signal(signal.SIGALRM, old_alarm)
|
|
|
|
# basic pty passed.
|
|
|
|
debug("calling pty.fork()")
|
|
pid, master_fd = pty.fork()
|
|
if pid == pty.CHILD:
|
|
# stdout should be connected to a tty.
|
|
if not os.isatty(1):
|
|
debug("Child's fd 1 is not a tty?!")
|
|
os._exit(3)
|
|
|
|
# After pty.fork(), the child should already be a session leader.
|
|
# (on those systems that have that concept.)
|
|
debug("In child, calling os.setsid()")
|
|
try:
|
|
os.setsid()
|
|
except OSError:
|
|
# Good, we already were session leader
|
|
debug("Good: OSError was raised.")
|
|
pass
|
|
except AttributeError:
|
|
# Have pty, but not setsid() ?
|
|
debug("No setsid() available ?")
|
|
pass
|
|
except:
|
|
# We don't want this error to propagate, escaping the call to
|
|
# os._exit() and causing very peculiar behavior in the calling
|
|
# regrtest.py !
|
|
# Note: could add traceback printing here.
|
|
debug("An unexpected error was raised.")
|
|
os._exit(1)
|
|
else:
|
|
debug("os.setsid() succeeded! (bad!)")
|
|
os._exit(2)
|
|
os._exit(4)
|
|
else:
|
|
debug("Waiting for child (%d) to finish."%pid)
|
|
##line = os.read(master_fd, 80)
|
|
##lines = line.replace('\r\n', '\n').split('\n')
|
|
##if False and lines != ['In child, calling os.setsid()',
|
|
## 'Good: OSError was raised.', '']:
|
|
## raise TestFailed("Unexpected output from child: %r" % line)
|
|
|
|
(pid, status) = os.waitpid(pid, 0)
|
|
res = status >> 8
|
|
debug("Child (%d) exited with status %d (%d)."%(pid, res, status))
|
|
if res == 1:
|
|
raise TestFailed, "Child raised an unexpected exception in os.setsid()"
|
|
elif res == 2:
|
|
raise TestFailed, "pty.fork() failed to make child a session leader."
|
|
elif res == 3:
|
|
raise TestFailed, "Child spawned by pty.fork() did not have a tty as stdout"
|
|
elif res != 4:
|
|
raise TestFailed, "pty.fork() failed for unknown reasons."
|
|
|
|
##debug("Reading from master_fd now that the child has exited")
|
|
##try:
|
|
## s1 = os.read(master_fd, 1024)
|
|
##except os.error:
|
|
## pass
|
|
##else:
|
|
## raise TestFailed("Read from master_fd did not raise exception")
|
|
|
|
|
|
os.close(master_fd)
|
|
|
|
# pty.fork() passed.
|