Changeset: ca15656eb48b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ca15656eb48b
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (35 lines):
diff --git
a/sql/test/concurrent/Tests/many-concurrent-client-connections.SQL.py
b/sql/test/concurrent/Tests/many-concurrent-client-connections.SQL.py
--- a/sql/test/concurrent/Tests/many-concurrent-client-connections.SQL.py
+++ b/sql/test/concurrent/Tests/many-concurrent-client-connections.SQL.py
@@ -1,7 +1,7 @@
import os, pymonetdb
from concurrent.futures import ProcessPoolExecutor, ThreadPoolExecutor
-if os.uname().sysname == 'Linux':
+if os.name == 'posix' and os.uname().sysname == 'Linux':
executor = ProcessPoolExecutor
else:
executor = ThreadPoolExecutor
diff --git a/sql/test/concurrent/Tests/read-segment-after-free.SQL.py
b/sql/test/concurrent/Tests/read-segment-after-free.SQL.py
--- a/sql/test/concurrent/Tests/read-segment-after-free.SQL.py
+++ b/sql/test/concurrent/Tests/read-segment-after-free.SQL.py
@@ -3,7 +3,7 @@ from concurrent.futures import ProcessPo
import time
from pymonetdb.exceptions import OperationalError
-if os.uname().sysname == 'Linux':
+if os.name == 'posix' and os.uname().sysname == 'Linux':
executor = ProcessPoolExecutor
else:
executor = ThreadPoolExecutor
diff --git a/sql/test/mapi/Tests/utf8test.SQL.py
b/sql/test/mapi/Tests/utf8test.SQL.py
--- a/sql/test/mapi/Tests/utf8test.SQL.py
+++ b/sql/test/mapi/Tests/utf8test.SQL.py
@@ -26,6 +26,7 @@ expectraw = f'''% sys.utf8test # table_n
% s # name
% varchar # type
% 32 # length
+% 50 0 # typesizes
[ "{text1}"\t]
[ "{text2}"\t]
'''
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
