Changeset: 5cfb3ec1ae60 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5cfb3ec1ae60 Removed Files: sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err.int128 Modified Files: sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py Branch: mtest Log Message:
Silence client's stderr, and removed redundant error output diffs (73 lines): 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 @@ -1,4 +1,6 @@ -import os, socket, sys, tempfile +import os, socket, tempfile + +from MonetDBtesting.sqltest import SQLTestCase try: from MonetDBtesting import process except ImportError: @@ -19,9 +21,7 @@ with tempfile.TemporaryDirectory() as fa dbfarm=os.path.join(farm_dir, 'db1'), stdin=process.PIPE, stdout=process.PIPE, stderr=process.PIPE) as srv: - with process.client('sql', port=myport, dbname='db1', - stdin=process.PIPE, stdout=process.PIPE, - stderr=process.PIPE) as c: - out, err = c.communicate('call sys.shutdown(10);') - sys.stderr.write(err) + with SQLTestCase() as tc: + tc.connect(username="monetdb", password="monetdb", port=myport, database='db1') + tc.execute("call sys.shutdown(10);").assertSucceeded() srv.communicate() diff --git a/sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err.int128 b/sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err.int128 deleted file mode 100644 --- a/sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err.int128 +++ /dev/null @@ -1,44 +0,0 @@ -stderr of test 'too-large-decimals.Bug-6192` in directory 'sql/test/BugTracker-2017` itself: - - -# 14:58:47 > -# 14:58:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32047" "--set" "mapi_usock=/var/tmp/mtest-18303/.s.monetdb.32047" "--set" "monet_prompt=" "--forcemito" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2017" "--set" "embedded_r=yes" "--set" "embedded_py=true" -# 14:58:47 > - -# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 32047 -# cmdline opt mapi_usock = /var/tmp/mtest-18303/.s.monetdb.32047 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2017 -# cmdline opt embedded_r = yes -# cmdline opt embedded_py = true -# cmdline opt gdk_debug = 536870922 - -# 14:58:48 > -# 14:58:48 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-18303" "--port=32047" -# 14:58:48 > - -MAPI = (monetdb) /var/tmp/mtest-18303/.s.monetdb.32047 -QUERY = INSERT INTO test_table4 VALUES (531421754532.553234531231250); -ERROR = !overflow in conversion to DECIMAL(12,2). -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = INSERT INTO test_table4 VALUES (531421754532); -ERROR = !overflow in conversion to DECIMAL(12,2). -CODE = 22003 - -# 14:58:48 > -# 14:58:48 > "Done." -# 14:58:48 > - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list