Changeset: 4ad73635de38 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4ad73635de38
Modified Files:
clients/Tests/exports.py
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py
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/emptydb/Tests/check.SQL.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-reload/Tests/reload.py
sql/test/testdb-reload2/Tests/reload.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
sql/test/testdb/Tests/dump.SQL.py
testing/sqllogictest.py
testing/sqltest.py
Branch: Dec2025
Log Message:
When reporting test diffs, always use unified diff between "expected" and
"received".
diffs (truncated from 390 to 300 lines):
diff --git a/clients/Tests/exports.py b/clients/Tests/exports.py
--- a/clients/Tests/exports.py
+++ b/clients/Tests/exports.py
@@ -4,5 +4,6 @@ import MonetDBtesting.listexports
with open('exports.stable.out') as fil:
stable = fil.readlines()
output = MonetDBtesting.listexports.listexports()
-for line in difflib.unified_diff(stable, output):
+for line in difflib.unified_diff(stable, output,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
@@ -21,9 +21,9 @@ except AttributeError:
def verify_output(stream, actual, expected):
diff = list(difflib.unified_diff(
expected.splitlines(),
- actual.splitlines(),
- "EXPECTED",
- "ACTUAL",
+ actual.splitlines() ,
+ fromfile='expected',
+ tofile='received',
lineterm=''
))
if not diff:
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
@@ -28,7 +28,8 @@ def main():
output = out.splitlines(keepends=True)
with open('MapiClient-dump.SF-905851.stable.out') as fil:
stable = fil.readlines()
- for line in difflib.unified_diff(stable, output):
+ for line in difflib.unified_diff(stable, output,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
main()
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
@@ -75,7 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -75,7 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -74,7 +74,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -75,7 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -75,7 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -75,7 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -74,7 +74,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -75,7 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(f) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
if len(cltout) != 3 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'SET SCHEMA "sys";' or cltout[2] != 'COMMIT;':
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
@@ -590,7 +590,10 @@ if check:
with open(stableout) as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff([x for x in stable if not
x.startswith('%')], [x for x in output if not x.startswith('%')],
fromfile='test', tofile=stableout):
+ for line in difflib.unified_diff(
+ [x for x in stable if not x.startswith('%')],
+ [x for x in output if not x.startswith('%')],
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
elif approve:
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
@@ -81,7 +81,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
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
@@ -81,7 +81,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
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
@@ -80,7 +80,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
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
@@ -81,7 +81,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
diff --git a/sql/test/testdb-reload/Tests/reload.py
b/sql/test/testdb-reload/Tests/reload.py
--- a/sql/test/testdb-reload/Tests/reload.py
+++ b/sql/test/testdb-reload/Tests/reload.py
@@ -87,7 +87,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(stableout, encoding='utf-8') as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, output, fromfile='test',
tofile=stableout):
+ for line in difflib.unified_diff(stable, output,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
else:
sys.stdout.writelines(d2out)
diff --git a/sql/test/testdb-reload2/Tests/reload.py
b/sql/test/testdb-reload2/Tests/reload.py
--- a/sql/test/testdb-reload2/Tests/reload.py
+++ b/sql/test/testdb-reload2/Tests/reload.py
@@ -87,7 +87,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
with open(stableout, encoding='utf-8') as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, output, fromfile='test',
tofile=stableout):
+ for line in difflib.unified_diff(stable, output,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
else:
sys.stdout.writelines(d2out)
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
@@ -81,7 +81,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
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
@@ -81,7 +81,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
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,7 +80,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
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,7 +81,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
del stable[i-1:i+4]
break
import difflib
- for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ for line in difflib.unified_diff(stable, srvout,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
xit = 1
else:
diff --git a/sql/test/testdb/Tests/dump.SQL.py
b/sql/test/testdb/Tests/dump.SQL.py
--- a/sql/test/testdb/Tests/dump.SQL.py
+++ b/sql/test/testdb/Tests/dump.SQL.py
@@ -31,7 +31,8 @@ if len(sys.argv) == 2 and sys.argv[1] in
with open(stableout, encoding='utf-8') as fil:
stable = fil.readlines()
import difflib
- for line in difflib.unified_diff(stable, output, fromfile='test',
tofile=stableout):
+ for line in difflib.unified_diff(stable, output,
+ fromfile='expected', tofile='received'):
sys.stderr.write(line)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
