Changeset: 3431ffb244bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3431ffb244bf
Modified Files:
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
sql/test/BugTracker-2020/Tests/remote-table-like.Bug-6841.py
sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py
sql/test/merge-partitions/Tests/mergepart23.SQL.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
sql/test/rename/Tests/rename00.SQL.py
sql/test/rename/Tests/rename11.py
sql/test/scripts/Tests/alastair_udf_mergetable_bug.py
Branch: mtest
Log Message:
Don't print server's stderr
diffs (truncated from 492 to 300 lines):
diff --git
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
--- a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
@@ -19,8 +19,7 @@ with tempfile.TemporaryDirectory() as fa
dbfarm=os.path.join(farm_dir, 'db1'),
stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE) as s:
- out, err = s.communicate()
- sys.stderr.write(err)
+ s.communicate()
with process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'),
stdin=process.PIPE,
@@ -48,5 +47,4 @@ with tempfile.TemporaryDirectory() as fa
cursor.close()
client.close()
- out, err = s.communicate()
- sys.stderr.write(err)
+ s.communicate()
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
@@ -34,8 +34,7 @@ with tempfile.TemporaryDirectory() as fa
cur1.close()
client1.close()
- out, err = dproc.communicate()
- sys.stderr.write(err)
+ dproc.communicate()
with process.server(mapiport=dport, dbname='db',
dbfarm=os.path.join(farm_dir, 'db'),
@@ -53,5 +52,4 @@ with tempfile.TemporaryDirectory() as fa
cur1.close()
client1.close()
- out, err = dproc.communicate()
- sys.stderr.write(err)
+ dproc.communicate()
diff --git
a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
--- a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
+++ b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
@@ -53,8 +53,7 @@ with tempfile.TemporaryDirectory() as fa
sys.stderr.write('Expected 2097152')
cur.close()
cli.close()
- out, err = s.communicate()
- sys.stderr.write(err)
+ s.communicate()
with process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'),
stdin=process.PIPE,
@@ -66,8 +65,7 @@ with tempfile.TemporaryDirectory() as fa
sys.stderr.write('Expected 2097152')
cur.close()
cli.close()
- out, err = s.communicate()
- sys.stderr.write(err)
+ s.communicate()
with process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'),
stdin=process.PIPE,
@@ -80,5 +78,4 @@ with tempfile.TemporaryDirectory() as fa
cur.execute('drop table table3282;')
cur.close()
cli.close()
- out, err = s.communicate()
- sys.stderr.write(err)
+ s.communicate()
diff --git a/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
b/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
--- a/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
+++ b/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
@@ -24,5 +24,4 @@ with tempfile.TemporaryDirectory() as fa
stderr=process.PIPE) as c:
out, err = c.communicate('call sys.shutdown(10);')
sys.stderr.write(err)
- out, err = srv.communicate()
- sys.stderr.write(err)
+ srv.communicate()
diff --git
a/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
b/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
---
a/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
+++
b/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
@@ -73,8 +73,6 @@ with tempfile.TemporaryDirectory() as fa
cur2.close()
conn2.close()
- out, err = prc2.communicate()
- sys.stderr.write(err)
+ prc2.communicate()
# cleanup: shutdown the monetdb servers and remove tempdir
- out, err = prc1.communicate()
- sys.stderr.write(err)
+ prc1.communicate()
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
--- a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
+++ b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
@@ -68,8 +68,5 @@ with tempfile.TemporaryDirectory() as fa
node2_conn.close()
# cleanup: shutdown the monetdb servers and remove tempdir
- out, err = node1_proc.communicate()
- sys.stderr.write(err)
-
- out, err = node2_proc.communicate()
- sys.stderr.write(err)
+ node1_proc.communicate()
+ node2_proc.communicate()
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
b/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
--- a/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
+++ b/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
@@ -70,8 +70,5 @@ with tempfile.TemporaryDirectory() as fa
conn2.close()
# cleanup: shutdown the monetdb servers and remove tempdir
- out, err = prc1.communicate()
- sys.stderr.write(err)
-
- out, err = prc2.communicate()
- sys.stderr.write(err)
+ prc1.communicate()
+ prc2.communicate()
diff --git a/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
b/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
--- a/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
+++ b/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
@@ -13,9 +13,6 @@ def freeport():
myport = freeport()
-def server_stop(s):
- out, err = s.communicate()
- sys.stderr.write(err)
with tempfile.TemporaryDirectory() as farm_dir:
os.mkdir(os.path.join(farm_dir, 'db1'))
@@ -31,7 +28,7 @@ with tempfile.TemporaryDirectory() as fa
''')
cur1.close()
client1.close()
- server_stop(s)
+ s.communicate()
with process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'),
@@ -42,7 +39,7 @@ with tempfile.TemporaryDirectory() as fa
cur1.execute('alter table t drop column c;')
cur1.close()
client1.close()
- server_stop(s)
+ s.communicate()
with process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'),
@@ -58,7 +55,7 @@ with tempfile.TemporaryDirectory() as fa
sys.stderr.write("Error: cannot drop column 'b': there are
database objects which depend on it expected")
cur1.close()
client1.close()
- server_stop(s)
+ s.communicate()
with process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'),
@@ -93,7 +90,7 @@ with tempfile.TemporaryDirectory() as fa
sys.stderr.write('[] expected')
cur1.close()
client1.close()
- server_stop(s)
+ s.communicate()
with process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'),
@@ -145,4 +142,4 @@ with tempfile.TemporaryDirectory() as fa
cur1.execute('drop table t;')
cur1.close()
client1.close()
- server_stop(s)
+ s.communicate()
diff --git
a/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
b/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
---
a/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
+++
b/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
@@ -71,7 +71,5 @@ with tempfile.TemporaryDirectory() as fa
conn1.close()
cur2.close()
conn2.close()
- out, err = prc2.communicate()
- sys.stderr.write(err)
- out, err = prc1.communicate()
- sys.stderr.write(err)
+ prc2.communicate()
+ prc1.communicate()
diff --git
a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
--- a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
+++ b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
@@ -36,8 +36,7 @@ with tempfile.TemporaryDirectory() as fa
sys.stderr.write("The result should have been 14")
cursor1.close()
client1.close()
- out, err = s.communicate()
- sys.stderr.write(err)
+ s.communicate()
with process.server(args = server_args, mapiport=port, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE) as s:
client1 = pymonetdb.connect(database='db1', port=port, autocommit=True)
@@ -57,5 +56,4 @@ with tempfile.TemporaryDirectory() as fa
""")
cursor1.close()
client1.close()
- out, err = s.communicate()
- sys.stderr.write(err)
+ s.communicate()
diff --git a/sql/test/BugTracker-2020/Tests/remote-table-like.Bug-6841.py
b/sql/test/BugTracker-2020/Tests/remote-table-like.Bug-6841.py
--- a/sql/test/BugTracker-2020/Tests/remote-table-like.Bug-6841.py
+++ b/sql/test/BugTracker-2020/Tests/remote-table-like.Bug-6841.py
@@ -69,8 +69,5 @@ with tempfile.TemporaryDirectory() as fa
sys.stderr.write("Just row (1, 'Name 1', None) expected")
# cleanup: shutdown the monetdb servers and remove tempdir
- out, err = node1_proc.communicate()
- sys.stderr.write(err)
-
- out, err = node2_proc.communicate()
- sys.stderr.write(err)
+ node1_proc.communicate()
+ node2_proc.communicate()
diff --git a/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
b/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
--- a/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
+++ b/sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
@@ -64,8 +64,5 @@ with tempfile.TemporaryDirectory() as fa
sys.stderr.write("Just row (0.5, 0.6) expected")
# cleanup: shutdown the monetdb servers and remove tempdir
- out, err = node1_proc.communicate()
- sys.stderr.write(err)
-
- out, err = node2_proc.communicate()
- sys.stderr.write(err)
+ node1_proc.communicate()
+ node2_proc.communicate()
diff --git
a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
--- a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
+++ b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
@@ -71,5 +71,4 @@ with tempfile.TemporaryDirectory() as fa
tc.execute("SELECT f2(p.ra,8,p.\"dec\") FROM t1999354a as
p;").assertSucceeded().assertRowCount(0).assertDataResultMatch([])
tc.execute("drop function f2;").assertSucceeded()
tc.execute("drop table t1999354a;").assertSucceeded()
- out, err = srv.communicate()
- sys.stderr.write(err)
+ srv.communicate()
diff --git
a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py
b/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py
--- a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py
+++ b/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py
@@ -32,8 +32,7 @@ with tempfile.TemporaryDirectory() as fa
ALTER USER "voc2" SET SCHEMA "voc2";
alter user "voc2" with password 'new';
""").assertSucceeded()
- out, err = srv.communicate()
- sys.stderr.write(err)
+ srv.communicate()
with server_start() as srv:
with SQLTestCase() as tc:
@@ -41,8 +40,7 @@ with tempfile.TemporaryDirectory() as fa
tc.execute("""
select 1;
""").assertSucceeded().assertRowCount(1).assertDataResultMatch([(1,)])
- out, err = srv.communicate()
- sys.stderr.write(err)
+ srv.communicate()
with server_start() as srv:
with SQLTestCase() as tc:
@@ -53,5 +51,4 @@ with tempfile.TemporaryDirectory() as fa
DROP SCHEMA "voc2";
DROP USER "voc2";
""").assertSucceeded()
- out, err = srv.communicate()
- sys.stderr.write(err)
+ srv.communicate()
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py
---
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py
+++
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py
@@ -32,8 +32,7 @@ with tempfile.TemporaryDirectory() as fa
create schema "sky" authorization "skyserver";
alter user "skyserver" set schema "sky";
""").assertSucceeded()
- out, err = srv.communicate()
- sys.stderr.write(err)
+ srv.communicate()
with server_start() as srv:
with SQLTestCase() as tc:
@@ -46,5 +45,4 @@ with tempfile.TemporaryDirectory() as fa
drop schema sky;
drop user skyserver;
""").assertSucceeded()
- out, err = srv.communicate()
- sys.stderr.write(err)
+ srv.communicate()
diff --git a/sql/test/merge-partitions/Tests/mergepart23.SQL.py
b/sql/test/merge-partitions/Tests/mergepart23.SQL.py
--- a/sql/test/merge-partitions/Tests/mergepart23.SQL.py
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
