Fix timeout handling in the test harness.
authorDavid Anderson <dvander@alliedmods.net>
Sun Nov 18 15:00:08 2012 -0800 (2012-11-18)
changeset 214e1a6deaa6ebe
parent 213 a9b8d24967d6
child 215 b8f650a441a5
Fix timeout handling in the test harness.
tests/harness.py
tests/test.py
     1.1 --- a/tests/harness.py	Sun Nov 18 14:56:09 2012 -0800
     1.2 +++ b/tests/harness.py	Sun Nov 18 15:00:08 2012 -0800
     1.3 @@ -50,7 +50,7 @@
     1.4    timeout = False
     1.5    th = Thread(target = RunTest_, args = (argv, options, L))
     1.6    th.start()
     1.7 -  th.join(60.0)
     1.8 +  th.join(10.0)
     1.9    while th.isAlive():
    1.10      if L[0] is not None:
    1.11        try:
     2.1 --- a/tests/test.py	Sun Nov 18 14:56:09 2012 -0800
     2.2 +++ b/tests/test.py	Sun Nov 18 15:00:08 2012 -0800
     2.3 @@ -54,7 +54,7 @@
     2.4          (ok, message) = self.compare(out)
     2.5  
     2.6      if timeout:
     2.7 -      ok = false
     2.8 +      ok = False
     2.9        message = 'timeout'
    2.10  
    2.11      return Result(ok, out, err, code, timeout, message)