Changeset: b2aa7bd7c59d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b2aa7bd7c59d
Modified Files:
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-upgrade-chain/Tests/upgrade.py
sql/test/testdb-upgrade-hge/Tests/upgrade.py
sql/test/testdb-upgrade/Tests/upgrade.py
Branch: default
Log Message:
Merge with Dec2025 branch.
diffs (235 lines):
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
@@ -31,5 +31,15 @@ def main():
for line in difflib.unified_diff(stable, output,
fromfile='expected', tofile='received'):
sys.stderr.write(line)
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'),
+ 'MapiClient-dump.SF-905851.stable.out')
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'),
+ 'MapiClient-dump.SF-905851.stable.out.new')
+ with open(fn, 'w') as f:
+ f.write(out)
main()
diff --git a/sql/test/emptydb/Tests/check.SQL.py
b/sql/test/emptydb/Tests/check.SQL.py
--- a/sql/test/emptydb/Tests/check.SQL.py
+++ b/sql/test/emptydb/Tests/check.SQL.py
@@ -48,12 +48,15 @@ if __name__ == '__main__':
if opts.stableout is not None:
stableout = opts.stableout
check = True
- if not approve and os.getenv('MTEST_APPROVE'):
+ if not approve and \
+ os.getenv('MTEST_APPROVE') and \
+ not os.path.exists(os.path.join(os.getenv('TSTSRCDIR'),
+ f'{stableout}.src')):
if os.getenv('MTEST_APPROVE') == 'REPLACE':
- approve = os.path.join(os.getenv('TSTSRCDIR'),
- f'check.stable.out{".32bit" if
os.getenv("TSTBITS") == "32" else ""}{".int128" if os.getenv("HAVE_HGE") else
""}')
+ approve = os.path.join(os.getenv('TSTSRCDIR'), stableout)
else:
- approve = os.path.join(os.getenv('TSTTRGDIR'),
'check.stable.out.new')
+ approve = os.path.join(os.getenv('TSTTRGDIR'),
+ 'check.stable.out.new')
xit = 0
output = []
diff --git a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
@@ -65,7 +65,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -85,6 +85,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
@@ -65,7 +65,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -85,6 +85,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
@@ -64,7 +64,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -84,6 +84,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.py
@@ -65,7 +65,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -85,6 +85,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
@@ -80,6 +80,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
@@ -80,6 +80,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.py
b/sql/test/testdb-upgrade-hge/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.py
@@ -80,6 +80,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.py
b/sql/test/testdb-upgrade/Tests/upgrade.py
--- a/sql/test/testdb-upgrade/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade/Tests/upgrade.py
@@ -81,6 +81,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
+ approve = os.getenv('MTEST_APPROVE')
+ if approve:
+ if approve == 'REPLACE':
+ fn = os.path.join(os.getenv('TSTSRCDIR'), f)
+ else:
+ fn = os.path.join(os.getenv('TSTTRGDIR'), f'{f}.new')
+ with open(fn, 'w') as fil:
+ fil.writelines(srvout)
else:
sys.stdout.writelines(srvout)
diff --git a/testing/sqltest.py b/testing/sqltest.py
--- a/testing/sqltest.py
+++ b/testing/sqltest.py
@@ -476,6 +476,9 @@ class MclientTestResult(TestCaseResult,
if os.getenv('MTEST_APPROVE'):
with open(fout+'.newtest', 'w') as f:
f.write(self.output or '')
+ if os.getenv('MTEST_APPROVE') == 'REPLACE':
+ with open(os.path.join(os.getenv('TSTSRCDIR'), fout), 'w') as
f:
+ f.write(self.output or '')
return self
def assertMatchStableError(self, ferr, ignore_err_messages=False,
ratio=0.95):
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
