Changeset: 1c132430a47a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1c132430a47a
Modified Files:
sql/test/BugTracker-2020/Tests/All
sql/test/BugTracker-2021/Tests/All
sql/test/Tests/All
testing/Mconvert.py.in
testing/Mtest.py.in
Branch: Sep2022
Log Message:
HAVE_PYMONETDB is a given, no need to test for it.
diffs (99 lines):
diff --git a/sql/test/BugTracker-2020/Tests/All
b/sql/test/BugTracker-2020/Tests/All
--- a/sql/test/BugTracker-2020/Tests/All
+++ b/sql/test/BugTracker-2020/Tests/All
@@ -40,7 +40,7 @@ savepoints_crash_mserver5_2.Bug-7021
transaction_with_unreleased_savepoint.Bug-7022
view_with_aggr_column.Bug-7023
delete-transaction-loose-inserts.Bug-7024
-HAVE_PYMONETDB?revokeRoleUserLoggedIN.Bug-7026
+revokeRoleUserLoggedIN.Bug-7026
drop-table-with-auto_increment.Bug-7030
-HAVE_PYMONETDB?dbfarm-foreign-chars.Bug-7031
+dbfarm-foreign-chars.Bug-7031
user-update-privs.Bug-7035
diff --git a/sql/test/BugTracker-2021/Tests/All
b/sql/test/BugTracker-2021/Tests/All
--- a/sql/test/BugTracker-2021/Tests/All
+++ b/sql/test/BugTracker-2021/Tests/All
@@ -1,5 +1,5 @@
update-from-count.Bug-7079
-HAVE_PYMONETDB?remote-table-ranges.Bug-7089
+remote-table-ranges.Bug-7089
#KNOWNFAIL?query-too-complex.Bug-7092 # this is a feature request rather than
a bug
KNOWNFAIL?remote-table-rollback.Bug-7094
ntile-wrong-result.Bug-7104
@@ -24,7 +24,7 @@ rollup-distinct-count.Bug-7146
sum-union.Bug-7147
distinct-union.Bug-7148
HAVE_LIBPY3?python-aggregates-empty.Bug-7158
-HAVE_PYMONETDB?remote-join-idxs.Bug-7165
+remote-join-idxs.Bug-7165
shutdown-force.Bug-7167
replace-transaction-conflict.Bug-7168
merge-table-join.Bug-7172
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -129,7 +129,7 @@ HAVE_LIBZ&!NOWAL?hot_snapshot_gz
HAVE_LIBBZ2&!NOWAL?hot_snapshot_bz2
HAVE_LIBLZMA&!NOWAL?hot_snapshot_xz
HAVE_PYTHON_LZ4&HAVE_LIBLZ4&!NOWAL?hot_snapshot_lz4
-!HAVE_PYTHON_LZ4&HAVE_PYMONETDB&HAVE_LIBLZ4&!NOWAL?hot_snapshot_lz4_lite
+!HAVE_PYTHON_LZ4&HAVE_LIBLZ4&!NOWAL?hot_snapshot_lz4_lite
# The following tests are some old tests moved from sql/test
## FOREIGN KEY reference to the same table
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -34,7 +34,7 @@ import struct
import signal
import fnmatch
import glob
-
+import pymonetdb # check for pymonetdb early: it is essential for our work
try:
import winreg # Python 3 on Windows
except ImportError:
@@ -417,7 +417,6 @@ CONDITIONALS = {
'HAVE_LIBSCIPY3' : "",
'HAVE_PERL' : "",
'HAVE_PHP' : "",
- 'HAVE_PYMONETDB' : "", # default PYTHON can import pymonetdb
'HAVE_PY3MONETDB' : "", # PYTHON3 exists and can import pymonetdb
'HAVE_PYTHON_LZ4' : "", # module lz4 is available
'HAVE_RUBY' : "",
@@ -1148,10 +1147,6 @@ def RunTest(env, test, oktests, pSrvr):
reason = "as %s is not available." % env['SQLCLIENT'].split(None, 1)[0]
elif EXT == ".sql" and not env['exe']['SQL_Dump'][0]:
reason = "as %s is not available." % env['SQLDUMP'].split(None, 1)[0]
- elif EXT == ".test" and not CONDITIONALS['HAVE_PYMONETDB']:
- reason = "as pymonetdb is not available."
- elif EXT == ".maltest" and not CONDITIONALS['HAVE_PYMONETDB']:
- reason = "as pymonetdb is not available."
elif SERVER in ["MAL", "SQL"] and not env['exe']['mserver5'][0]:
reason = "as %s is not available." % env['MSERVER'].split(None, 1)[0]
elif EXT == ".malS" and not env['exe']['mserver5'][0]:
@@ -2518,12 +2513,6 @@ def main(argv) :
else:
CONDITIONALS['HAVE_PY3MONETDB'] = '' # no pymonetdb for python3
try:
- import pymonetdb
- except ImportError:
- print('Python available, but pymonetdb package not available')
- else:
- CONDITIONALS['HAVE_PYMONETDB'] = '#'
- try:
import lz4
except ImportError:
CONDITIONALS['HAVE_PYTHON_LZ4'] = False
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -396,7 +396,6 @@ CONDITIONALS = {
'HAVE_LIBSCIPY3' : False,
'HAVE_PERL' : False,
'HAVE_PHP' : False,
- 'HAVE_PYMONETDB' : True, # default PYTHON can import pymonetdb
'HAVE_PYTHON_LZ4' : False, # module lz4 is available
'HAVE_RUBY' : False,
'HAVE_CPP' : False,
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
