Changeset: 02fd591b7d33 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/02fd591b7d33
Modified Files:
testing/Mtest.py.in
testing/Mz.py.in
testing/sqllogictest.py
Branch: default
Log Message:
Use test timeout to set session timeout when using sqllogictest.
diffs (55 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2940,7 +2940,8 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
hostname='localhost',
port=int(env['MAPIPORT']),
database=TSTDB,
- language=lang)
+ language=lang,
+ timeout=TIMEOUT)
except KeyboardInterrupt:
raise
except:
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -1813,7 +1813,8 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
hostname='localhost',
port=int(env['MAPIPORT']),
database=TSTDB,
- language=lang)
+ language=lang,
+ timeout=TIMEOUT)
except:
returncode = 'error'
else:
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -101,11 +101,13 @@ class SQLLogic:
self.close()
def connect(self, username='monetdb', password='monetdb',
- hostname='localhost', port=None, database='demo',
language='sql'):
+ hostname='localhost', port=None, database='demo',
+ language='sql', timeout=None):
self.language = language
self.hostname = hostname
self.port = port
self.database = database
+ self.timeout = timeout
if language == 'sql':
self.dbh = pymonetdb.connect(username=username,
password=password,
@@ -594,6 +596,10 @@ class SQLLogic:
def parse(self, f, approve=None):
self.approve = approve
self.initfile(f)
+ if self.language == 'sql':
+ self.crs.execute(f'call sys.setsession(cast({self.timeout or 0} as
bigint))')
+ else:
+ self.crs.execute(f'clients.setsession({self.timeout or 0}:lng)')
while True:
skipping = False
line = self.readline()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
