Changeset: 64fa82112301 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/64fa82112301
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (121 lines):
diff --git
a/sql/test/BugTracker-2025/Tests/7654_non_monetdb_user_remote_table_exec.test.in
b/sql/test/BugTracker-2025/Tests/7654_non_monetdb_user_remote_table_exec.test.in
---
a/sql/test/BugTracker-2025/Tests/7654_non_monetdb_user_remote_table_exec.test.in
+++
b/sql/test/BugTracker-2025/Tests/7654_non_monetdb_user_remote_table_exec.test.in
@@ -1,8 +1,6 @@
-@connection(id=c1, username=monetdb, password=monetdb)
statement ok
create user u1 with password 'u1' name 'u1'
-@connection(id=c1, username=monetdb, password=monetdb)
statement ok
create user u2 with password 'u2' name 'u2'
@@ -14,7 +12,7 @@ create table foo as select * from genera
statement ok
create remote table foo(value smallint) on
'mapi:monetdb://localhost:$MAPIPORT/$TSTDB/u1/foo' with user 'u1' password 'u1'
-@connection(id=c3, username=u2, password=u2)
+@connection(id=c3)
query I nosort
select count(*) from foo
----
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -91,19 +91,19 @@ if isatty:
GREEN = '\033[0;32m'
PURPLE = '\033[1;35m' # actually magenta
BLACK = '\033[0;0m'
- def prred(str):
+ def prred(str, *, RED=RED, BLACK=BLACK):
try:
print(RED, end='')
print(str, end='')
finally:
print(BLACK, end='')
- def prgreen(str):
+ def prgreen(str, *, GREEN=GREEN, BLACK=BLACK):
try:
print(GREEN, end='')
print(str, end='')
finally:
print(BLACK, end='')
- def prpurple(str):
+ def prpurple(str, *, PURPLE=PURPLE, BLACK=BLACK):
try:
print(PURPLE, end='')
print(str, end='')
@@ -130,7 +130,7 @@ if isatty:
left, top, right, bottom, maxx, maxy) =
struct.unpack('hhhhHhhhhhh', csbi.raw)
return wattr
reset = get_csbi_attributes(handle)
- def prred(str,
+ def prred(str, *,
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
print(end='', flush=True)
@@ -138,7 +138,7 @@ if isatty:
print(str, end='', flush=True)
finally:
scta(handle, reset)
- def prgreen(str,
+ def prgreen(str, *,
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
print(end='', flush=True)
@@ -146,7 +146,7 @@ if isatty:
print(str, end='', flush=True)
finally:
scta(handle, reset)
- def prpurple(str,
+ def prpurple(str, *,
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
print(end='', flush=True)
@@ -1130,10 +1130,7 @@ def PerformDir(env, testdir, testlist, t
return elem, max(FdOut, FdErr), interrupted
# find length of longest test name
- length = 0
- for tst in testlist:
- if len(tst[0]) > length:
- length = len(tst[0])
+ length = max([len(tst[0]) for tst in testlist])
if TSTDIR == os.curdir:
RELSRCDIR = os.path.join(os.pardir, env['RELSRCBASE'], TSTSUFF)
@@ -1808,6 +1805,17 @@ relcond = {
'last hugeint chained empty'),
}
+tests = (
+ # file extension EXT CALL SERVER
+ ('.test', '.test', 'sqltest','SQL'),
+ ('.maltest', '.maltest','maltest','SQL'),
+ ('.py', '.py', 'python', ''),
+ ('.SQL.py', '.SQL.py', 'python', 'SQL'),
+ ('.sql', '.sql', 'sql', 'SQL'),
+ ('.R', '.R', 'R', 'SQL'),
+ ('.rb', '.rb', 'ruby', 'SQL'),
+)
+
def RunTest(env, TST, COND, oktests, length, pSrvr, total_tests, options,
environ, TSTDB, TSTDIR, TSTSRCDIR, RELSRCDIR, TSTTRGDIR) :
Failed = F_SKIP
FailedOut = F_SKIP
@@ -1831,16 +1839,6 @@ def RunTest(env, TST, COND, oktests, len
CALL = 'other'
SERVER = 'SQL'
else:
- tests = (
- # file extension EXT CALL SERVER
- ('.test', '.test', 'sqltest','SQL'),
- ('.maltest', '.maltest','maltest','SQL'),
- ('.py', '.py', 'python', ''),
- ('.SQL.py', '.SQL.py', 'python', 'SQL'),
- ('.sql', '.sql', 'sql', 'SQL'),
- ('.R', '.R', 'R', 'SQL'),
- ('.rb', '.rb', 'ruby', 'SQL'),
- )
for tst, ext, cll, srv in tests:
if os.path.isfile(os.path.join(TSTSRCDIR, TST + tst)) or \
os.path.isfile(os.path.join(TSTSRCDIR, TST + tst + '.src')) or \
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
