Changeset: 052430bf2951 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/052430bf2951
Branch: default
Log Message:
Merge branch 'Sep2022' into 'default'
diffs (67 lines):
diff --git a/common/stream/Tests/read_iconv.py
b/common/stream/Tests/read_iconv.py
--- a/common/stream/Tests/read_iconv.py
+++ b/common/stream/Tests/read_iconv.py
@@ -20,26 +20,38 @@ def run_streamcat(text, enc, expected_er
filename = tf.write(enc_text)
cmd = ['streamcat', 'read', filename, 'rstream', f'iconv:{enc}']
- descr = f"command {cmd} with input {enc_text!r}"
+ descr = f"command {cmd}\nwith input {enc_text!r}"
proc = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
output = proc.stdout
os.remove(filename)
+ def show_stderr():
+ if proc.stderr:
+ print("--- STDERR ---", file=sys.stderr)
+ sys.stderr.buffer.write(proc.stderr)
+ # if proc.stderr.endswith(b'\n'):
+ else:
+ print("--- NOTHING ON STDERR ---", file=sys.stderr)
+
if expected_error:
if proc.returncode == 0:
- print(f"{descr} exited without expected error", file=sys.stderr)
+ print(f"{descr}\nexited without expected error", file=sys.stderr)
+ show_stderr()
sys.exit(1)
elif expected_error not in proc.stderr:
- print(f"{descr} failed as expected but stderr does not contain
{expected_error!r}", file=sys.stderr)
+ print(f"{descr}\nfailed as expected but stderr does not contain
{expected_error!r}:", file=sys.stderr)
+ show_stderr()
sys.exit(1)
else:
return
if proc.returncode != 0:
- print(f"{descr} exited with status {proc.returncode}", file=sys.stderr)
+ print(f"{descr}\nexited with status {proc.returncode}",
file=sys.stderr)
+ show_stderr()
sys.exit(1)
if output != expected:
- print(f"{descr} yielded {output!r}, expected {expected!r}")
+ print(f"{descr}\nyielded {output!r}, expected {expected!r}",
file=sys.stderr)
+ show_stderr()
sys.exit(1)
diff --git a/common/stream/Tests/write_iconv.py
b/common/stream/Tests/write_iconv.py
--- a/common/stream/Tests/write_iconv.py
+++ b/common/stream/Tests/write_iconv.py
@@ -18,13 +18,14 @@ def run_streamcat(text, enc):
cmd = ['streamcat', 'write', tf.path(), 'wstream', f'iconv:{enc}']
proc = subprocess.run(cmd, input=utf8_text)
if proc.returncode != 0:
- print(f"command {cmd} exited with status {proc.returncode} for input
{utf8_text!r} ({text!r})", file=sys.stderr)
+ print(f"command {cmd}\nexited with status {proc.returncode}\nfor input
{utf8_text!r} ({text!r})", file=sys.stderr)
sys.exit(1)
output = tf.read()
os.remove(tf.path())
if output != expected:
- raise Exception(f"command {cmd} with input {utf8_text!r} yielded
{output!r}, expected {expected!r}")
+ print(f"command {cmd}\nwith input {utf8_text!r} ({text!r})\nyielded
{output!r}, expected {expected!r}", file=sys.stderr)
+ sys.exit(1)
text = "MøNëTDB"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
