MonetDB: protocol - Don't use -fraw in tests because it makes no...

[Mark Raasveldt]

Changeset: de3ee2290202 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de3ee2290202
Modified Files:
        sql/test/mapi/Tests/utf8test.SQL.py
        sql/test/mapi/Tests/utf8test.stable.out
Branch: protocol
Log Message:

Don't use -fraw in tests because it makes no sense with the new protocol, now 
use -fcsv.


diffs (79 lines):

diff --git a/sql/test/mapi/Tests/utf8test.SQL.py 
b/sql/test/mapi/Tests/utf8test.SQL.py
--- a/sql/test/mapi/Tests/utf8test.SQL.py
+++ b/sql/test/mapi/Tests/utf8test.SQL.py
@@ -23,13 +23,13 @@ sys.stderr.write(err)
 out, err = client(['-s', "insert into utf8test values ('funny characters: 
%s')" % funny])
 sys.stdout.write(out)
 sys.stderr.write(err)
-out, err = client(['-fraw', '-s', 'select * from utf8test'])
+out, err = client(['-fcsv', '-s', 'select * from utf8test'])
 sys.stdout.write(out)
 sys.stderr.write(err)
 out, err = client(['-fsql', '-s', 'select * from utf8test'])
 sys.stdout.write(out)
 sys.stderr.write(err)
-out, err = client(['-fraw', '-Eiso-8859-1', '-s', 'select * from utf8test'],
+out, err = client(['-fcsv', '-Eiso-8859-1', '-s', 'select * from utf8test'],
                   universal_newlines = False)
 out = out.decode('iso-8859-1')
 err = err.decode('iso-8859-1')
@@ -47,7 +47,7 @@ if sys.version_info[0] == 2:
     err = err.encode('utf-8')
 sys.stdout.write(out)
 sys.stderr.write(err)
-out, err = client(['-fraw', '-Eus-ascii', '-s', 'select * from utf8test'],
+out, err = client(['-fcsv', '-Eus-ascii', '-s', 'select * from utf8test'],
                   universal_newlines = False)
 out = out.decode('us-ascii')
 err = err.decode('us-ascii')
diff --git a/sql/test/mapi/Tests/utf8test.stable.out 
b/sql/test/mapi/Tests/utf8test.stable.out
--- a/sql/test/mapi/Tests/utf8test.stable.out
+++ b/sql/test/mapi/Tests/utf8test.stable.out
@@ -44,17 +44,8 @@ Ready.
 # 10:26:28 >  
 
 [ 1    ]
-
-# 10:26:28 >  
-# 10:26:28 >  Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb 
--host=ottar --port=32641  -fraw -s 'select * from utf8test'
-# 10:26:28 >  
-
-% sys.utf8test # table_name
-% s # name
-% varchar # type
-% 32 # length
-[ "value without special characters"   ]
-[ "funny characters: àáâãäå"     ]
+value without special characters
+funny characters: àáâãäå
 select * from utf8test
 +----------------------------------+
 | s                                |
@@ -63,12 +54,8 @@ select * from utf8test
 | funny characters: àáâãäå         |
 +----------------------------------+
 2 tuples
-% sys.utf8test # table_name
-% s # name
-% varchar # type
-% 32 # length
-[ "value without special characters"   ]
-[ "funny characters: àáâãäå"     ]
+value without special characters
+funny characters: àáâãäå
 select * from utf8test
 +----------------------------------+
 | s                                |
@@ -77,11 +64,7 @@ select * from utf8test
 | funny characters: àáâãäå         |
 +----------------------------------+
 2 tuples
-% sys.utf8test # table_name
-% s # name
-% varchar # type
-% 32 # length
-[ "value without special characters"   ]
+value without special characters
 select * from utf8test
 +----------------------------------+
 | s                                |
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list