Changeset: b6e6d11f7b59 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6e6d11f7b59
Modified Files:
monetdb5/modules/mal/Tests/All
testing/Mtest.py.in
Branch: Jul2015
Log Message:
Skip tests that cannot succeed because of bad hostname configuration.
diffs (70 lines):
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -31,26 +31,26 @@ mat
remoteInit
-remote01
-remote02
-HAVE_GEOM?remote03
-remote04
-remote06
-remote07
-remote08
-remote09
-remote11
-remote12
+!BAD_HOSTNAME?remote01
+!BAD_HOSTNAME?remote02
+!BAD_HOSTNAME&HAVE_GEOM?remote03
+!BAD_HOSTNAME?remote04
+!BAD_HOSTNAME?remote06
+!BAD_HOSTNAME?remote07
+!BAD_HOSTNAME?remote08
+!BAD_HOSTNAME?remote09
+!BAD_HOSTNAME?remote11
+!BAD_HOSTNAME?remote12
# needs Merovingian and aims at SQL
-#remote88
-#remote89
-remote99
+#!BAD_HOSTNAME?remote88
+#!BAD_HOSTNAME?remote89
+!BAD_HOSTNAME?remote99
-remote10
+!BAD_HOSTNAME?remote10
# this will always return something else
-#sabaoth00
-sabaoth01
+#!BAD_HOSTNAME?sabaoth00
+!BAD_HOSTNAME?sabaoth01
partition
batpartition
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -331,6 +331,7 @@ CONDITIONALS = {
'HAVE_JDBCTESTS_DIR' : "",
'HAVE_JDBCTESTS' : "",
'MERCURIAL' : "",
+ 'BAD_HOSTNAME' : "",
}
# a bunch of classes to help with generating (X)HTML files
@@ -3762,6 +3763,12 @@ def main(argv) :
pass
os.chdir(BACK)
+ # check whether our hostname makes sense
+ try:
+ socket.getaddrinfo(socket.gethostname(), 50000)
+ except:
+ CONDITIONALS['BAD_HOSTNAME'] = '#' # True
+
# read '.Mapprove.rc'
if THISFILE == 'Mapprove.py':
f = os.path.join(TSTTRGBASE, TSTPREF, '.Mapprove.rc')
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
