MonetDB: copybinary - Normalize paths in bincopy test output

[Joeri van Ruth]

Changeset: 6b9573a5d7ae for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b9573a5d7ae
Modified Files:
        sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
        sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
        sql/test/bincopy/Tests/bincopy_support.py
Branch: copybinary
Log Message:

Normalize paths in bincopy test output


diffs (62 lines):

diff --git a/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err 
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
--- a/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
+++ b/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
@@ -21,9 +21,8 @@ stderr of test 'bincopy_broken_strings_o
 
 
 
-MAPI  = (monetdb) /var/tmp/mtest-29878/.s.monetdb.38969
-QUERY = COPY BINARY INTO foo(id, s) FROM R'/tmp/jvr/bincopy_ints.bin', 
R'/tmp/jvr/bincopy_broken_strings.bin' ON CLIENT;
-
+MAPI  = (monetdb) /var/tmp/mtest-6318/.s.monetdb.30483
+QUERY = COPY BINARY INTO foo(id, s) FROM 
R'${TSTTRGBASE}/mTests/sql/test/bincopy/bincopy_ints.bin', 
R'${TSTTRGBASE}/mTests/sql/test/bincopy/bincopy_broken_strings.bin' ON CLIENT;
 ERROR = !malformed utf-8 byte sequence
 
 
diff --git a/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err 
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
--- a/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
+++ b/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
@@ -24,13 +24,12 @@ stderr of test 'bincopy_broken_strings_o
 # 10:17:52 >  
 
 
-# 10:17:52 >  
-# 10:17:52 >  mclient -lsql -ftest -tnone -Eutf-8 -i -e 
--host=/var/tmp/mtest-17076 --port=32201 --database=mTests_sql_test_bincopy
-# 10:17:52 >  
+# 10:19:42 >  
+# 10:19:42 >  mclient -lsql -ftest -tnone -Eutf-8 -i -e 
--host=/var/tmp/mtest-6318 --port=30483 --database=mTests_sql_test_bincopy
+# 10:19:42 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-29878/.s.monetdb.38969
-QUERY = COPY BINARY INTO foo(id, s) FROM R'/tmp/jvr/bincopy_ints.bin', 
R'/tmp/jvr/bincopy_broken_strings.bin' ON SERVER;
-
+MAPI  = (monetdb) /var/tmp/mtest-6318/.s.monetdb.30483
+QUERY = COPY BINARY INTO foo(id, s) FROM 
R'${TSTTRGBASE}/mTests/sql/test/bincopy/bincopy_ints.bin', 
R'${TSTTRGBASE}/mTests/sql/test/bincopy/bincopy_broken_strings.bin' ON SERVER;
 ERROR = !malformed utf-8 byte sequence
 
 # 16:40:12 >  
diff --git a/sql/test/bincopy/Tests/bincopy_support.py 
b/sql/test/bincopy/Tests/bincopy_support.py
--- a/sql/test/bincopy/Tests/bincopy_support.py
+++ b/sql/test/bincopy/Tests/bincopy_support.py
@@ -3,6 +3,7 @@ import array
 import codecs
 import os
 import re
+import sys
 
 try:
     from MonetDBtesting import process
@@ -43,8 +44,13 @@ def run_test(side, code):
 
     with process.client('sql',
                     stdin=process.PIPE, input=code,
+                    stdout=process.PIPE, stderr=process.PIPE,
                     log=True) as p:
         out, err = p.communicate()
+    sys.stdout.write(out.replace(os.environ['TSTTRGBASE'].replace('\\', 
'\\\\'),'${TSTTRGBASE}').replace('\\\\','/'))
+    sys.stderr.write(err.replace(os.environ['TSTTRGBASE'].replace('\\', 
'\\\\'),'${TSTTRGBASE}').replace('\\\\','/'))
+
+
 
 
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list