Changeset: eb74bf94714c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/eb74bf94714c
Modified Files:
sql/jdbc/tests/Tests/All
testing/Mtest.py.in
Branch: Aug2024
Log Message:
Don't run TLSTester if cryptography module missing.
diffs (53 lines):
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -1,5 +1,5 @@
HAVE_JDBCTESTS?JDBC_API_Tester
-HAVE_JDBCTESTS?TLSTester
+HAVE_JDBCTESTS&HAVE_CRYPTOGRAPHY?TLSTester
HAVE_JDBCTESTS?OnClientTester
HAVE_JDBCCLIENT_JAR?Test_JdbcClient
# next test should be done AFTER all the other tests have completed
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -402,12 +402,8 @@ CONDITIONALS = {
'HAVE_JDBCCLIENT_JAR' : False,
'HAVE_JDBCTESTS_JAR' : False,
'HAVE_JDBCTESTS' : False,
-# 'HAVE_LIBPANDAS3' : False,
- 'HAVE_LIBSCIPY3' : False,
'HAVE_PERL' : False,
'HAVE_PHP' : False,
- 'HAVE_PYODBC' : False,
- 'HAVE_PYTHON_LZ4' : False, # module lz4 is available
'HAVE_RUBY' : False,
'HAVE_CPP' : False,
'HAVE_DATA_PATH' : False,
@@ -416,6 +412,12 @@ CONDITIONALS = {
'BAD_HOSTNAME' : False,
'HAVE_IPV6' : False,
'NOWAL' : False,
+ # optional Python modules
+# 'HAVE_LIBPANDAS3' : False,
+ 'HAVE_LIBSCIPY3' : False, # import scipy
+ 'HAVE_CRYPTOGRAPHY' : False, # import cryptography
+ 'HAVE_PYODBC' : False, # import pyodbc
+ 'HAVE_PYTHON_LZ4' : False, # import lz4
}
# a bunch of classes to help with generating (X)HTML files
@@ -3697,6 +3699,13 @@ def main(argv) :
else:
CONDITIONALS['HAVE_LIBSCIPY3'] = True
+ try:
+ import cryptography
+ except ImportError:
+ CONDITIONALS['HAVE_CRYPTOGRAPHY'] = False
+ else:
+ CONDITIONALS['HAVE_CRYPTOGRAPHY'] = True
+
if env.get('TSTDATAPATH'):
CONDITIONALS['HAVE_DATA_PATH'] = True
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
