Changeset: 0ead21899042 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ead21899042
Modified Files:
testing/Mtest.py.in
Branch: Apr2019
Log Message:
In testweb, after global timeout, mention all skipped tests.
This makes it easier for the testweb to show all tests.
diffs (46 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1371,9 +1371,15 @@ def PerformDir(env, testdir, testlist, B
alllinks = []
try:
for TST,COND in testlist:
- os.environ['TST'] = TST
- tt, FtOut, FtErr, bodyline, reason, links = RunTest(env, TST,
BusyPorts, COND, oktests, length, all_tests)
- alllinks.extend(links)
+ 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, BusyPorts, COND, oktests, length, all_tests)
+ alllinks.extend(links)
if tt:
t = "%7.3f" % tt
else:
@@ -1389,9 +1395,6 @@ def PerformDir(env, testdir, testlist, B
body_bad.append(bodyline)
if FtOut in (F_OK, F_WARN) and FtErr in (F_OK, F_WARN):
oktests.append(TST)
- if global_timeout and start_time + global_timeout <
time.time():
- print('\nGlobal testing timeout reached\n')
- break
except KeyboardInterrupt:
print('\nInterrupted')
interrupted = True
@@ -4502,10 +4505,10 @@ def main(argv) :
body_bad.append(elem)
if interrupted:
break
- if global_timeout and start_time + global_timeout <
time.time():
- print('\nGlobal testing timeout reached\n')
- break
if not testweb:
+ if global_timeout and start_time + global_timeout <
time.time():
+ print('\nGlobal testing timeout reached\n')
+ break
# after a directory has been tested, create
# the index file so that we can look at test
# results while the tests are running
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
