tps: implement --yes intrusively

This redefines raw_input to return 'y' always in case of EOF, and closes stdin so that --yes forces this behaviour when requested to do so. This is mostly redundant: it has to be decided by the testers what they really want.

tps: implement --yes intrusively
This redefines raw_input to return 'y' always in case of EOF, and closes stdin so that --yes forces this behaviour when requested to do so. This is mostly redundant: it has to be decided by the testers what they really want.
5fa4ea9f · Juan David González Cobas · 1c73034c · 5fa4ea9f · 5fa4ea9f
Commit 5fa4ea9f authored Jun 10, 2011 by Juan David González Cobas
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

tps.py tps.py +9 -2

tpsexcept.py tpsexcept.py +7 -0

No files found.
--- a/tps.py
+++ b/tps.py
@@ -27,17 +27,24 @@ default_log_name     = 'tps_run_{runid}_{timestamp}_{board}_{serial}.txt'
 default_test_pattern = r'test[0-9][0-9]'
 default_test_syntax  = r'(test)?(\d\d)'
-def run_test(testname, logname):
+def run_test(testname, logname, yes=False):
    """run test testname with output redirected to logname
+    If yes is true, assume affirmative answers from the user
    """
    try:
        tmpout = sys.stdout
        sys.stdout = open(logname, 'w')
+        if yes:
+            tmpin = sys.stdin
+            sys.stdin = open('/dev/null')
        mod = __import__(testname, globals(), locals(), [])
        mod.main(default_directory='./test/spec/python')
    finally:
        sys.stdout.close()
        sys.stdout = tmpout
+        if yes:
+            sys.stdin  = tmpin
 class Suite(object):
    def __init__(self, cfgfilename=default_config_file):
@@ -190,7 +197,7 @@ class Suite(object):
                log.write('------------------------\n')
                log.write('running test {0} = {1}\n'.format(shortname, test))
                print '.',
-                run_test(testname, logname)
+                run_test(testname, logname, yes=self.yes)
            except TpsCritical, e:
                print 'test [%s]: critical error, aborting: [%s]' % (shortname, e)
                log.write('    critical error in test {0}, exception [{1}]\n'.format(shortname, e))

--- a/tpsexcept.py
+++ b/tpsexcept.py
@@ -31,5 +31,12 @@ class TpsBadTestNo(TpsInvalid):
    """reserved: a bad test number was given"""
    pass
+def raw_input(msg, default='y'):
+    try:
+        ret = __builtins__.raw_input(msg)
+    except EOFError:
+        return default
+    return ret
 if __name__ == '__main__':
    pass