Changeset: 8ee1e02a1e31 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ee1e02a1e31
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (36 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1406,16 +1406,22 @@ def PerformDir(env, testdir, testlist, t
print('\nFailed to start server.\n')
FdOut = FdErr = F_FAIL
break
- dbh = pymonetdb.connect(username='monetdb',
- password='monetdb',
- hostname=HOST,
- port=int(pSrvr.port),
- database=TSTDB,
- autocommit=True)
- crs = dbh.cursor()
- crs.execute("call logging.setcomplevel('SQL_EXECUTION',
'INFO')")
- crs.close()
- dbh.close()
+ try:
+ dbh = pymonetdb.connect(username='monetdb',
+ password='monetdb',
+ hostname=HOST,
+ port=int(pSrvr.port),
+ database=TSTDB,
+ autocommit=True)
+ except KeyboardInterrupt:
+ raise
+ except:
+ pass
+ else:
+ crs = dbh.cursor()
+ crs.execute("call
logging.setcomplevel('SQL_EXECUTION', 'INFO')")
+ crs.close()
+ dbh.close()
os.environ['MAPIPORT'] = env['MAPIPORT'] = pSrvr.port
SetExecEnv(env['exe'], pSrvr.port, verbosity > 1)
if global_timeout and start_time + global_timeout <
time.time():
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
