Changeset: c71cd9ec276c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c71cd9ec276c
Modified Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
sql/test/emptydb-previous-upgrade/Tests/upgrade.py
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
sql/test/emptydb-upgrade-chain/Tests/upgrade.py
sql/test/emptydb-upgrade-hge/Tests/upgrade.py
sql/test/emptydb-upgrade/Tests/upgrade.py
Branch: Dec2025
Log Message:
Make Mtest.py --approve(+replace) work for emptydb upgrade tests.
diffs (144 lines):
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
@@ -82,6 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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/emptydb-previous-upgrade-chain/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
@@ -82,6 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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/emptydb-previous-upgrade-hge/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
@@ -81,6 +81,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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/emptydb-previous-upgrade/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.py
@@ -82,6 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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/emptydb-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
@@ -82,6 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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/emptydb-upgrade-chain/Tests/upgrade.py
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
@@ -82,6 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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/emptydb-upgrade-hge/Tests/upgrade.py
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
@@ -81,6 +81,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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/emptydb-upgrade/Tests/upgrade.py
b/sql/test/emptydb-upgrade/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.py
@@ -82,6 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
sys.stderr.write('\n'.join(cltout))
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)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
