diff options
| author | Martin <martin@leo.fri1.uni-lj.si> | 2015-09-21 10:12:40 +0200 |
|---|---|---|
| committer | Martin <martin@leo.fri1.uni-lj.si> | 2015-09-21 10:12:40 +0200 |
| commit | f352ad0ea7e6e85ab42e56822779a4bf06400f04 (patch) | |
| tree | c18df02548049104f82785710c2f0be814ee460c | |
| parent | fe545bd1c782f5228323d360181d7aeccfce0324 (diff) | |
Changed testing in util.py
Changed output when timeout occurs in Python
| -rw-r--r-- | python/util.py | 4 | ||||
| -rw-r--r-- | server/python_session.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python/util.py b/python/util.py index f149953..21426ca 100644 --- a/python/util.py +++ b/python/util.py @@ -47,5 +47,5 @@ def string_contains_number(s, a): if __name__ == '__main__': - print(has_token_sequence('x + y >= 0', ['>=', '0'])) - print(has_token_sequence('x + y > 0', ['>=', '0'])) + print(has_token_sequence(get_tokens('x + y >= 0'), ['>=', '0'])) + print(has_token_sequence(get_tokens('x + y > 0'), ['>=', '0'])) diff --git a/server/python_session.py b/server/python_session.py index 62fcbf8..7ffb070 100644 --- a/server/python_session.py +++ b/server/python_session.py @@ -51,7 +51,7 @@ class PythonSession(object): if conn.poll(real_timeout): results.append(conn.recv()) else: - results.append('timed out') + results.append((None, None, None, 'timed out')) p.terminate() return results |