Changeset: e093e160a65c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e093e160a65c
Modified Files:
testing/Mtest.py.in
Branch: Oct2012
Log Message:
Extension of changeset 40287ed38dc5: also retry after failed mapi_ping.
diffs (28 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2704,6 +2704,24 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
if ServerReady:
port = int(env['MAPIPORT'])
ServerReady = mapi_ping(port, lang)
+ if not ServerReady:
+ pSrvr.stdin.close()
+ CollectIt(pSrvr.stdout, SrvrOut)
+ pSrvr.wait()
+ time.sleep(120)
+ ServerReady = True
+ pSrvr, pSrvrTimer = LaunchIt(Srvr,
'\nio.printf("\\nReady.\\n");\n', SrvrOut, SrvrErr, TIMEOUT)
+ ln="dummy"
+ while 0 < len(ln) and ln[:6] != 'Ready.':
+ ln=pSrvr.stdout.readline()
+ SrvrOut.write(ln)
+ SrvrOut.flush()
+ if ln[:6] != 'Ready.':
+ ServerReady = False
+
+ if ServerReady:
+ port = int(env['MAPIPORT'])
+ ServerReady = mapi_ping(port, lang)
else:
ClntOut = open(TestOutFile, 'a')
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
