Changeset: 14fb51040a20 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14fb51040a20
Modified Files:
sql/test/mapi/Tests/utf8test.SQL.py
sql/test/mapi/Tests/utf8test.stable.out
Branch: Mar2018
Log Message:
Make sure output is printed with newline.
diffs (108 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
@@ -10,25 +10,30 @@ def client(args, universal_newlines = Tr
universal_newlines = universal_newlines)
return clt.communicate()
+def printit(file, string):
+ file.write(string)
+ if not string.endswith('\n'):
+ file.write('\n')
+
funny = u'\u00e0\u00e1\u00e2\u00e3\u00e4\u00e5'
if sys.version_info[0] == 2:
funny = funny.encode('utf-8')
out, err = client(['-s', 'create table utf8test (s varchar(50))'])
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-s', "insert into utf8test values ('value without special
characters')"])
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-s', "insert into utf8test values ('funny characters:
%s')" % funny])
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-fraw', '-s', 'select * from utf8test'])
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-fsql', '-s', 'select * from utf8test'])
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-fraw', '-Eiso-8859-1', '-s', 'select * from utf8test'],
universal_newlines = False)
out = out.decode('iso-8859-1')
@@ -36,8 +41,8 @@ err = err.decode('iso-8859-1')
if sys.version_info[0] == 2:
out = out.encode('utf-8')
err = err.encode('utf-8')
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-fsql', '-Eiso-8859-1', '-s', 'select * from utf8test'],
universal_newlines = False)
out = out.decode('iso-8859-1')
@@ -45,8 +50,8 @@ err = err.decode('iso-8859-1')
if sys.version_info[0] == 2:
out = out.encode('utf-8')
err = err.encode('utf-8')
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-fraw', '-Eus-ascii', '-s', 'select * from utf8test'],
universal_newlines = False)
out = out.decode('us-ascii')
@@ -54,8 +59,8 @@ err = err.decode('us-ascii')
if sys.version_info[0] == 2:
out = out.encode('utf-8')
err = err.encode('utf-8')
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-fsql', '-Eus-ascii', '-s', 'select * from utf8test'],
universal_newlines = False)
out = out.decode('us-ascii')
@@ -63,8 +68,8 @@ err = err.decode('us-ascii')
if sys.version_info[0] == 2:
out = out.encode('utf-8')
err = err.encode('utf-8')
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
out, err = client(['-s', 'drop table utf8test'])
-sys.stdout.write(out)
-sys.stderr.write(err)
+printit(sys.stdout, out)
+printit(sys.stderr, err)
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
@@ -87,12 +87,8 @@ select * from utf8test
| s |
+==================================+
| value without special characters |
-|2 tuples
-
-# 10:26:28 >
-# 10:26:28 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=ottar --port=32641 -s 'drop table utf8test'
-# 10:26:28 >
-
+|
+#drop table utf8test
# 10:26:28 >
# 10:26:28 > Done.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
