#!/usr/bin/env python
+from __future__ import print_function
import os, sys, re
import argparse, time
+import signal, atexit
-import pty, signal, atexit
from subprocess import Popen, STDOUT, PIPE
from select import select
+# Pseudo-TTY and terminal manipulation
+import pty, array, fcntl, termios
+
IS_PY_3 = sys.version_info[0] == 3
+debug_file = None
+log_file = None
+
+def debug(data):
+ if debug_file:
+ debug_file.write(data)
+ debug_file.flush()
+
+def log(data, end='\n'):
+ if log_file:
+ log_file.write(data + end)
+ log_file.flush()
+ print(data, end=end)
+ sys.stdout.flush()
+
# TODO: do we need to support '\n' too
sep = "\r\n"
#sep = "\n"
help="default timeout for each individual test action")
parser.add_argument('--pre-eval', default=None, type=str,
help="Mal code to evaluate prior to running the test")
-parser.add_argument('--mono', action='store_true',
- help="Use workarounds Mono/.Net Console misbehaviors")
+parser.add_argument('--no-pty', action='store_true',
+ help="Use direct pipes instead of pseudo-tty")
+parser.add_argument('--log-file', type=str,
+ help="Write messages to the named file in addition the screen")
+parser.add_argument('--debug-file', type=str,
+ help="Write all test interaction the named file")
+parser.add_argument('--hard', action='store_true',
+ help="Turn soft tests following a ';>>> soft=True' into hard failures")
parser.add_argument('test_file', type=argparse.FileType('r'),
help="a test file formatted as with mal test data")
"specify a Mal command line with dashed options.")
class Runner():
- def __init__(self, args, mono=False):
+ def __init__(self, args, no_pty=False):
#print "args: %s" % repr(args)
- self.mono = mono
+ self.no_pty = no_pty
# Cleanup child process on exit
atexit.register(self.cleanup)
- if mono:
+ self.p = None
+ env = os.environ
+ env['TERM'] = 'dumb'
+ env['INPUTRC'] = '/dev/null'
+ env['PERL_RL'] = 'false'
+ if no_pty:
self.p = Popen(args, bufsize=0,
stdin=PIPE, stdout=PIPE, stderr=STDOUT,
- preexec_fn=os.setsid)
+ preexec_fn=os.setsid,
+ env=env)
self.stdin = self.p.stdin
self.stdout = self.p.stdout
else:
# provide tty to get 'interactive' readline to work
master, slave = pty.openpty()
+
+ # Set terminal size large so that readline will not send
+ # ANSI/VT escape codes when the lines are long.
+ buf = array.array('h', [100, 200, 0, 0])
+ fcntl.ioctl(master, termios.TIOCSWINSZ, buf, True)
+
self.p = Popen(args, bufsize=0,
stdin=slave, stdout=slave, stderr=STDOUT,
- preexec_fn=os.setsid)
+ preexec_fn=os.setsid,
+ env=env)
+ # Now close slave so that we will get an exception from
+ # read when the child exits early
+ # http://stackoverflow.com/questions/11165521
+ os.close(slave)
self.stdin = os.fdopen(master, 'r+b', 0)
self.stdout = self.stdin
[outs,_,_] = select([self.stdout], [], [], 1)
if self.stdout in outs:
new_data = self.stdout.read(1)
- #print "new_data: '%s'" % new_data
new_data = new_data.decode("utf-8") if IS_PY_3 else new_data
- if self.mono:
+ #print("new_data: '%s'" % new_data)
+ debug(new_data)
+ if self.no_pty:
self.buf += new_data.replace("\n", "\r\n")
else:
self.buf += new_data
return bytes(s, "utf-8") if IS_PY_3 else s
self.stdin.write(_to_bytes(str + "\n"))
- if self.mono:
- # Simulate echo
- self.buf += _to_bytes(str + "\r\n")
def cleanup(self):
#print "cleaning up"
if self.p:
- os.killpg(self.p.pid, signal.SIGTERM)
+ try:
+ os.killpg(self.p.pid, signal.SIGTERM)
+ except OSError:
+ pass
self.p = None
+class TestReader:
+ def __init__(self, test_file, print=print):
+ self.line_num = 0
+ self.data = test_file.read().split('\n')
+ self.print = print
+ self.soft = False
+
+ def next(self):
+ self.form = None
+ self.out = ""
+ self.ret = None
+
+ while self.data:
+ self.line_num += 1
+ line = self.data.pop(0)
+ if re.match(r"^\s*$", line): # blank line
+ continue
+ elif line[0:3] == ";;;": # ignore comment
+ continue
+ elif line[0:2] == ";;": # output comment
+ log(line[3:])
+ continue
+ elif line[0:5] == ";>>> ": # settings/commands
+ settings = {}
+ exec(line[5:], {}, settings)
+ if 'soft' in settings: self.soft = True
+ continue
+ elif line[0:1] == ";": # unexpected comment
+ log("Test data error at line %d:\n%s" % (self.line_num, line))
+ return None
+ self.form = line # the line is a form to send
+
+ # Now find the output and return value
+ while self.data:
+ line = self.data[0]
+ if line[0:3] == ";=>":
+ self.ret = line[3:]
+ self.line_num += 1
+ self.data.pop(0)
+ break
+ elif line[0:2] == "; ":
+ self.out = self.out + line[2:] + sep
+ self.line_num += 1
+ self.data.pop(0)
+ else:
+ self.ret = "*"
+ break
+ if self.ret: break
+
+ return self.form
args = parser.parse_args(sys.argv[1:])
-test_data = args.test_file.read().split('\n')
+# Workaround argparse issue with two '--' on command line
+if sys.argv.count('--') > 0:
+ args.mal_cmd = sys.argv[sys.argv.index('--')+1:]
if args.rundir: os.chdir(args.rundir)
-r = Runner(args.mal_cmd, mono=args.mono)
-
-
-test_idx = 0
-def read_test(data):
- global test_idx
- form, output, ret = None, "", None
- while data:
- test_idx += 1
- line = data.pop(0)
- if re.match(r"^\s*$", line): # blank line
- continue
- elif line[0:3] == ";;;": # ignore comment
- continue
- elif line[0:2] == ";;": # output comment
- print(line[3:])
- continue
- elif line[0:2] == ";": # unexpected comment
- print("Test data error at line %d:\n%s" % (test_idx, line))
- return None, None, None, test_idx
- form = line # the line is a form to send
-
- # Now find the output and return value
- while data:
- line = data[0]
- if line[0:3] == ";=>":
- ret = line[3:].replace('\\r', '\r').replace('\\n', '\n')
- test_idx += 1
- data.pop(0)
- break
- elif line[0:2] == "; ":
- output = output + line[2:] + sep
- test_idx += 1
- data.pop(0)
- else:
- ret = "*"
- break
- if ret: break
+if args.log_file: log_file = open(args.log_file, "a")
+if args.debug_file: debug_file = open(args.debug_file, "a")
- return form, output, ret, test_idx
+r = Runner(args.mal_cmd, no_pty=args.no_pty)
+t = TestReader(args.test_file)
-def assert_prompt(timeout):
+
+def assert_prompt(runner, prompts, timeout):
# Wait for the initial prompt
- header = r.read_to_prompt(['user> ', 'mal-user> '], timeout=timeout)
+ header = runner.read_to_prompt(prompts, timeout=timeout)
if not header == None:
if header:
- print("Started with:\n%s" % header)
+ log("Started with:\n%s" % header)
else:
- print("Did not get 'user> ' or 'mal-user> ' prompt")
- print(" Got : %s" % repr(r.buf))
+ log("Did not one of following prompt(s): %s" % repr(prompts))
+ log(" Got : %s" % repr(r.buf))
sys.exit(1)
# Wait for the initial prompt
-assert_prompt(args.start_timeout)
+assert_prompt(r, ['user> ', 'mal-user> '], args.start_timeout)
# Send the pre-eval code if any
if args.pre_eval:
p.write(args.pre_eval)
assert_prompt(args.test_timeout)
+test_cnt = 0
+pass_cnt = 0
fail_cnt = 0
+soft_fail_cnt = 0
+failures = []
-while test_data:
- form, out, ret, line_num = read_test(test_data)
- if form == None:
- break
- sys.stdout.write("TEST: %s -> [%s,%s]" % (form, repr(out), repr(ret)))
- sys.stdout.flush()
- expected = "%s%s%s%s" % (form, sep, out, ret)
+while t.next():
+ log("TEST: %s -> [%s,%s]" % (t.form, repr(t.out), t.ret), end='')
- r.writeline(form)
+ # The repeated form is to get around an occasional OS X issue
+ # where the form is repeated.
+ # https://github.com/kanaka/mal/issues/30
+ expected = ["%s%s%s%s" % (t.form, sep, t.out, t.ret),
+ "%s%s%s%s%s%s" % (t.form, sep, t.form, sep, t.out, t.ret)]
+
+ r.writeline(t.form)
try:
+ test_cnt += 1
res = r.read_to_prompt(['\r\nuser> ', '\nuser> ',
'\r\nmal-user> ', '\nmal-user> '],
timeout=args.test_timeout)
#print "%s,%s,%s" % (idx, repr(p.before), repr(p.after))
- if ret == "*" or res == expected:
- print(" -> SUCCESS")
+ if t.ret == "*" or res in expected:
+ log(" -> SUCCESS")
+ pass_cnt += 1
else:
- print(" -> FAIL (line %d):" % line_num)
- print(" Expected : %s" % repr(expected))
- print(" Got : %s" % repr(res))
- fail_cnt += 1
+ if t.soft and not args.hard:
+ log(" -> SOFT FAIL (line %d):" % t.line_num)
+ soft_fail_cnt += 1
+ fail_type = "SOFT "
+ else:
+ log(" -> FAIL (line %d):" % t.line_num)
+ fail_cnt += 1
+ fail_type = ""
+ log(" Expected : %s" % repr(expected[0]))
+ log(" Got : %s" % repr(res))
+ failed_test = """%sFAILED TEST (line %d): %s -> [%s,%s]:
+ Expected : %s
+ Got : %s""" % (fail_type, t.line_num, t.form, repr(t.out), t.ret, repr(expected[0]), repr(res))
+ failures.append(failed_test)
except:
- print("Got Exception")
+ _, exc, _ = sys.exc_info()
+ log("\nException: %s" % repr(exc))
+ log("Output before exception:\n%s" % r.buf)
sys.exit(1)
+if len(failures) > 0:
+ log("\nFAILURES:")
+ for f in failures:
+ log(f)
+
+results = """
+TEST RESULTS (for %s):
+ %3d: soft failing tests
+ %3d: failing tests
+ %3d: passing tests
+ %3d: total tests
+""" % (args.test_file.name, soft_fail_cnt, fail_cnt,
+ pass_cnt, test_cnt)
+log(results)
+
+debug("\n") # add some separate to debug log
+
if fail_cnt > 0:
- print("FAILURES: %d" % fail_cnt)
- sys.exit(2)
+ sys.exit(1)
sys.exit(0)
HCoop / jackhill / mal.git / blobdiff