Changeset: 9bc5ef26ef34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9bc5ef26ef34
Modified Files:
testing/Mtest.py.in
Branch: Jan2022
Log Message:
No need for nested try blocks.
diffs (135 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1346,70 +1346,69 @@ def PerformDir(env, testdir, testlist, a
alllinks = []
pSrvr = None
try:
- try:
- for TST,COND in testlist:
- if oneserver and (pSrvr is None or pSrvr.poll() is not
None):
- # restart server
- inmem = single_in_memory
- for o in options:
- if o.startswith('embedded'):
- inmem = False
- break
- if inmem:
- cmd = splitcommand(env['exe']['mserver5'][1]) +
['--set', 'gdk_dbname=%s' % TSTDB, '--in-memory'] + mserver5_opts + options
- pollfile = None
- cmd.append('--set')
-
cmd.append('gdk_dbtrace={}'.format(os.path.join(LogDBdir, 'mdbtrace.log')))
- else:
- cmd = splitcommand(env['exe']['mserver5'][1]) +
['--dbpath=%s' % LogDBdir] + mserver5_opts + options
- pollfile = os.path.join(LogDBdir, '.started')
- if env.get('MULTIFARM'):
- cmd.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
- shutil.rmtree(os.path.join(env['GDK_DBFARM'],
TSTPREF + '_transient'),
- ignore_errors = True)
- os.makedirs(os.path.join(env['GDK_DBFARM'],
TSTPREF + '_transient'))
- elif env.get('TRANS_INMEM'):
- cmd.append('--dbextra=in-memory')
- pSrvr = ServerClass(cmd,
- openutf8(os.path.join(TSTTRGDIR,
'SingleServer.out'), 'a'),
- openutf8(os.path.join(TSTTRGDIR,
'SingleServer.err'), 'a'),
- 0,
- pollfile,
- inmem)
- os.chdir(TSTTRGDIR)
- pSrvr.LaunchIt()
- if pSrvr.port is None:
- print('\nFailed to start server.\n')
+ for TST,COND in testlist:
+ if oneserver and (pSrvr is None or pSrvr.poll() is not None):
+ # restart server
+ inmem = single_in_memory
+ for o in options:
+ if o.startswith('embedded'):
+ inmem = False
break
- os.environ['MAPIPORT'] = env['MAPIPORT'] = pSrvr.port
- SetExecEnv(env['exe'],pSrvr.port,verbose)
- if global_timeout and start_time + global_timeout <
time.time():
- if not testweb:
- print('\nGlobal testing timeout reached\n')
- break
- tt, FtOut, FtErr, bodyline, reason =
0,F_SKIP,F_SKIP,None,"as the global timeout has been reached"
- else:
- os.environ['TST'] = TST
- tt, FtOut, FtErr, bodyline, reason, links =
RunTest(env, TST, COND, oktests, length, all_tests, pSrvr)
- alllinks.extend(links)
- if tt:
- t = "%7.3f" % tt
+ if inmem:
+ cmd = splitcommand(env['exe']['mserver5'][1]) +
['--set', 'gdk_dbname=%s' % TSTDB, '--in-memory'] + mserver5_opts + options
+ pollfile = None
+ cmd.append('--set')
+
cmd.append('gdk_dbtrace={}'.format(os.path.join(LogDBdir, 'mdbtrace.log')))
else:
- t = '-.---'
- TIMES.append((TSTDIR, TST, t, tt, FtOut, FtErr, reason))
- td += tt
- FdOut = max(FdOut,FtOut)
- FdErr = max(FdErr,FtErr)
- if bodyline is not None:
- if FtOut <= F_OK and FtErr <= F_OK:
- body_good.append(bodyline)
- else:
- body_bad.append(bodyline)
- if FtOut in (F_OK, F_WARN) and FtErr in (F_OK, F_WARN):
- oktests.append(TST)
- except KeyboardInterrupt:
- print('\nInterrupted')
- interrupted = True
+ cmd = splitcommand(env['exe']['mserver5'][1]) +
['--dbpath=%s' % LogDBdir] + mserver5_opts + options
+ pollfile = os.path.join(LogDBdir, '.started')
+ if env.get('MULTIFARM'):
+ cmd.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
+ shutil.rmtree(os.path.join(env['GDK_DBFARM'], TSTPREF
+ '_transient'),
+ ignore_errors = True)
+ os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF +
'_transient'))
+ elif env.get('TRANS_INMEM'):
+ cmd.append('--dbextra=in-memory')
+ pSrvr = ServerClass(cmd,
+ openutf8(os.path.join(TSTTRGDIR,
'SingleServer.out'), 'a'),
+ openutf8(os.path.join(TSTTRGDIR,
'SingleServer.err'), 'a'),
+ 0,
+ pollfile,
+ inmem)
+ os.chdir(TSTTRGDIR)
+ pSrvr.LaunchIt()
+ if pSrvr.port is None:
+ print('\nFailed to start server.\n')
+ break
+ os.environ['MAPIPORT'] = env['MAPIPORT'] = pSrvr.port
+ SetExecEnv(env['exe'],pSrvr.port,verbose)
+ if global_timeout and start_time + global_timeout <
time.time():
+ if not testweb:
+ print('\nGlobal testing timeout reached\n')
+ break
+ tt, FtOut, FtErr, bodyline, reason =
0,F_SKIP,F_SKIP,None,"as the global timeout has been reached"
+ else:
+ os.environ['TST'] = TST
+ tt, FtOut, FtErr, bodyline, reason, links = RunTest(env,
TST, COND, oktests, length, all_tests, pSrvr)
+ alllinks.extend(links)
+ if tt:
+ t = "%7.3f" % tt
+ else:
+ t = '-.---'
+ TIMES.append((TSTDIR, TST, t, tt, FtOut, FtErr, reason))
+ td += tt
+ FdOut = max(FdOut,FtOut)
+ FdErr = max(FdErr,FtErr)
+ if bodyline is not None:
+ if FtOut <= F_OK and FtErr <= F_OK:
+ body_good.append(bodyline)
+ else:
+ body_bad.append(bodyline)
+ if FtOut in (F_OK, F_WARN) and FtErr in (F_OK, F_WARN):
+ oktests.append(TST)
+ except KeyboardInterrupt:
+ print('\nInterrupted')
+ interrupted = True
finally:
if pSrvr is not None:
pSrvr.terminate()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
