Changeset: 1fd253759e0b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1fd253759e0b
Modified Files:
testing/Mtest.py.in
testing/helpers.py
Branch: mtest
Log Message:
no drop for sqllogic test
diffs (53 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1011,6 +1011,8 @@ def RunTest(env, test, oktests, pSrvr):
CALL = test.get('call')
SERVER = test.get('server')
TST = test.get('test_name')
+ is_reqtest = test.get('is_reqtest', False)
+ has_reqtests = len(test.get('reqtests', [])) > 0
# are there missing modules?
MissingMods = CheckMods(env, test, SERVER)
@@ -1166,7 +1168,7 @@ def RunTest(env, test, oktests, pSrvr):
t0 = time.time()
if CALL == 'sqltest':
- exit_code, reason = RunSQLLogicTest(env, (TST + EXT), None,
TestErrFile)
+ exit_code, reason = RunSQLLogicTest(env, (TST + EXT), None,
TestErrFile, is_reqtest=is_reqtest, has_reqtests=has_reqtests)
else:
tres = DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, MAPIsockets, nomito, threads, user, passwd, COND,
pSrvr)
exit_code = transform_str_return_code(tres)
@@ -1641,7 +1643,7 @@ def mapi_ping(port) :
return False
### mapi_ping() #
-def RunSQLLogicTest(env, Test, TestOut, TestErr) -> (int, str):
+def RunSQLLogicTest(env, Test, TestOut, TestErr, is_reqtest=False,
has_reqtests=False) -> (int, str):
"""
Run SQLLogic test
returns:
@@ -1663,8 +1665,8 @@ def RunSQLLogicTest(env, Test, TestOut,
msg = "Connection refused"
print(e, file=f)
else:
- # TODO handle exception
- sql.drop()
+ #if not (has_reqtests or is_reqtest):
+ # sql.drop()
try:
sql.parse(Test)
except sqllogictest.SQLLogicSyntaxError as e:
diff --git a/testing/helpers.py b/testing/helpers.py
--- a/testing/helpers.py
+++ b/testing/helpers.py
@@ -75,7 +75,7 @@ def process_test_dir(dir_path:str, ctx={
('.rb', '.rb', 'ruby', 'SQL'),
)
# required tests that needs to run before this test
- # TODO enforce order by reqtests aka myabe sort at the end
+ # TODO enforce order at the end
if os.path.isfile(test_path + '.reqtests'):
reqtests = []
missing_reqtests = []
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
