From 6fe70e12fe147f346d231bd632d52b64fc11353e Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Mon, 18 Apr 2016 16:28:56 +0200 Subject: [PATCH] Some failures were crashing the test driver Some tests are meant to fail, however some failures were actually crashing the test driver. This fixes the issue. --- driver.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/driver.py b/driver.py index 989d221..22d6b06 100755 --- a/driver.py +++ b/driver.py @@ -191,27 +191,25 @@ def run_fail_test(testname): print ("Running fail test: " + colorize(testname, COLOR_MAGENTA)) query = readfile('%s%s.fail' % (tests_path, testname)).strip() - o_query = optimizer.optimize_all(query, rels) - - expr = parser.parse(query) - o_expr = parser.parse(o_query) - test_succeed = True try: + expr = parser.parse(query) expr(rels) test_succeed = False except: pass try: + o_query = optimizer.optimize_all(query, rels) + o_expr = parser.parse(o_query) o_expr(rels) test_succeed = False except: pass - c_expr = parser.tree(query).toCode() try: + c_expr = parser.tree(query).toCode() eval(c_expr, rels) test_succeed = False except: