summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJeremiah Senkpiel <fishrock123@rocketmail.com>2016-05-20 19:05:54 -0400
committerRod Vagg <rod@vagg.org>2016-06-02 22:42:05 +1000
commit6439fbfac015662ef3ec19cddd814e55a09635a5 (patch)
tree2f0c0b8cf7a14211ecce5d51f122d43a624dd41b /tools
parent4d3a7594a5627212c06a4d95aec6e003c2460690 (diff)
downloadnode-new-6439fbfac015662ef3ec19cddd814e55a09635a5.tar.gz
test: test TTY problems by fakeing a TTY using openpty
Many thanks to thefourtheye and addaleax who helped make the python bits of this possible. See https://github.com/nodejs/node/issues/6980 for more info regarding the related TTY issues. Refs: https://github.com/nodejs/node/issues/6456 Refs: https://github.com/nodejs/node/pull/6773 Refs: https://github.com/nodejs/node/pull/6816 PR-URL: https://github.com/nodejs/node/pull/6895 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/test.py67
1 files changed, 55 insertions, 12 deletions
diff --git a/tools/test.py b/tools/test.py
index a8df0b937e..ab3da337bc 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -576,11 +576,17 @@ def RunProcess(context, timeout, args, **rest):
error_mode = SEM_NOGPFAULTERRORBOX;
prev_error_mode = Win32SetErrorMode(error_mode);
Win32SetErrorMode(error_mode | prev_error_mode);
+
+ faketty = rest.pop('faketty', False)
+ pty_out = rest.pop('pty_out')
+
process = subprocess.Popen(
shell = utils.IsWindows(),
args = popen_args,
**rest
)
+ if faketty:
+ os.close(rest['stdout'])
if utils.IsWindows() and context.suppress_dialogs and prev_error_mode != SEM_INVALID_VALUE:
Win32SetErrorMode(prev_error_mode)
# Compute the end time - if the process crosses this limit we
@@ -592,6 +598,29 @@ def RunProcess(context, timeout, args, **rest):
# loop and keep track of whether or not it times out.
exit_code = None
sleep_time = INITIAL_SLEEP_TIME
+ output = ''
+ if faketty:
+ while True:
+ if time.time() >= end_time:
+ # Kill the process and wait for it to exit.
+ KillProcessWithID(process.pid)
+ exit_code = process.wait()
+ timed_out = True
+ break
+
+ # source: http://stackoverflow.com/a/12471855/1903116
+ # related: http://stackoverflow.com/q/11165521/1903116
+ try:
+ data = os.read(pty_out, 9999)
+ except OSError as e:
+ if e.errno != errno.EIO:
+ raise
+ break # EIO means EOF on some systems
+ else:
+ if not data: # EOF
+ break
+ output += data
+
while exit_code is None:
if (not end_time is None) and (time.time() >= end_time):
# Kill the process and wait for it to exit.
@@ -604,7 +633,7 @@ def RunProcess(context, timeout, args, **rest):
sleep_time = sleep_time * SLEEP_TIME_FACTOR
if sleep_time > MAX_SLEEP_TIME:
sleep_time = MAX_SLEEP_TIME
- return (process, exit_code, timed_out)
+ return (process, exit_code, timed_out, output)
def PrintError(str):
@@ -626,29 +655,43 @@ def CheckedUnlink(name):
PrintError("os.unlink() " + str(e))
break
-def Execute(args, context, timeout=None, env={}):
- (fd_out, outname) = tempfile.mkstemp()
- (fd_err, errname) = tempfile.mkstemp()
+def Execute(args, context, timeout=None, env={}, faketty=False):
+ if faketty:
+ import pty
+ (out_master, fd_out) = pty.openpty()
+ fd_err = fd_out
+ pty_out = out_master
+ else:
+ (fd_out, outname) = tempfile.mkstemp()
+ (fd_err, errname) = tempfile.mkstemp()
+ pty_out = None
# Extend environment
env_copy = os.environ.copy()
for key, value in env.iteritems():
env_copy[key] = value
- (process, exit_code, timed_out) = RunProcess(
+ (process, exit_code, timed_out, output) = RunProcess(
context,
timeout,
args = args,
stdout = fd_out,
stderr = fd_err,
- env = env_copy
+ env = env_copy,
+ faketty = faketty,
+ pty_out = pty_out
)
- os.close(fd_out)
- os.close(fd_err)
- output = file(outname).read()
- errors = file(errname).read()
- CheckedUnlink(outname)
- CheckedUnlink(errname)
+ if faketty:
+ os.close(out_master)
+ errors = ''
+ else:
+ os.close(fd_out)
+ os.close(fd_err)
+ output = file(outname).read()
+ errors = file(errname).read()
+ CheckedUnlink(outname)
+ CheckedUnlink(errname)
+
return CommandOutput(exit_code, timed_out, output, errors)