Changeset: 575176c28cd9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/575176c28cd9
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
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
sql/test/testdb-previous-upgrade/Tests/upgrade.py
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: Aug2024
Log Message:
If upgrade fails, print client and server standard error output.
(grafted from 1aa2a39df68e985891957f12a18df530fc24f3fa)
diffs (288 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,4 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -83,4 +83,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -82,4 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -83,4 +83,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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,4 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -83,4 +83,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -82,4 +82,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -83,4 +83,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -85,4 +85,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -86,4 +86,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -85,4 +85,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -86,4 +86,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -85,4 +85,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -86,4 +86,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -85,4 +85,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
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
@@ -86,4 +86,14 @@ if len(sys.argv) == 2 and sys.argv[1] ==
else:
sys.stdout.writelines(srvout)
+if xit:
+ if clterr:
+ sys.stderr.write('Client standard error:\n')
+ sys.stderr.write(clterr)
+ sys.stderr.write('\n')
+ if srverr:
+ sys.stderr.write('Server standard error:\n')
+ sys.stderr.write(srverr)
+ sys.stderr.write('\n')
+
sys.exit(xit)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
