Changeset: 19ba7a116100 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19ba7a116100
Modified Files:
Branch: default
Log Message:
merged test fix from Jun2010
diffs (162 lines):
diff -r 904a76bfdf47 -r 19ba7a116100
sql/src/test/Connections/Tests/connections.py
--- a/sql/src/test/Connections/Tests/connections.py Sun Jul 25 14:32:09
2010 +0200
+++ b/sql/src/test/Connections/Tests/connections.py Mon Jul 26 11:20:21
2010 +0200
@@ -68,6 +68,8 @@
'connections_syntax.sql'))
sys.stdout.write(out)
sys.stderr.write(err)
+ sys.stdout.flush()
+ sys.stderr.flush()
c += 1
out, err = client(x, s, c,
@@ -75,6 +77,8 @@
'connections_semantic.sql'))
sys.stdout.write(out)
sys.stderr.write(err)
+ sys.stdout.flush()
+ sys.stderr.flush()
c += 1
out, err = client(x, s, c,
@@ -82,14 +86,20 @@
'connections_default_values.sql'))
sys.stdout.write(out)
sys.stderr.write(err)
+ sys.stdout.flush()
+ sys.stderr.flush()
out, err = server_stop(remote_srv)
sys.stdout.write(out)
sys.stderr.write(err)
+ sys.stdout.flush()
+ sys.stderr.flush()
out, err = server_stop(srv)
sys.stdout.write(out)
sys.stderr.write(err)
+ sys.stdout.flush()
+ sys.stderr.flush()
def main():
x = 0
diff -r 904a76bfdf47 -r 19ba7a116100
sql/src/test/Connections/Tests/connections.stable.err
--- a/sql/src/test/Connections/Tests/connections.stable.err Sun Jul 25
14:32:09 2010 +0200
+++ b/sql/src/test/Connections/Tests/connections.stable.err Mon Jul 26
11:20:21 2010 +0200
@@ -8,6 +8,55 @@
server 11
#mserver
+
+server 12
+#remote mserver
+
+server 12, client 1
+#client1
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' port 34 database
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password
'monetdb' language 'sql';
+ERROR = !IOException:mapi.connect:Could not connect: could not connect
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test_db_1' language 'sql';
+ERROR = !syntax error, unexpected LANGUAGE, expecting USER in: "connect to
'localhost' port 32497 database 'mTests_src_test_Connections_test1' as
'test_db_1' language"
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' database 'mTests_src_test_Connections_test1';
+ERROR = !syntax error, unexpected SCOLON, expecting USER in: "connect to
'localhost' database 'mTests_src_test_Connections_test1';"
+MAPI = mone...@alviss:32496
+QUERY = connect 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password
'monetdb' language 'sql';
+ERROR = !syntax error, unexpected STRING, expecting TO in: "connect
'localhost'"
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 as 'test_db_1' user 'monetdb'
password 'monetdb' language 'sql';
+ERROR = !syntax error, unexpected AS, expecting DATABASE in: "connect to
'localhost' port 32497 as"
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' language 'sql';
+ERROR = !syntax error, unexpected LANGUAGE, expecting PASSWORD in: "connect to
'localhost' port 32497 database 'mTests_src_test_Connections_test1' as
'test_db' user 'monetdb' language"
+MAPI = mone...@alviss:32496
+QUERY = disconnect 'test_db_1';
+ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db_1'
+
+server 12, client 2
+#client1
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32498 database
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' password
'monetdb' language 'sql';
+ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db'
was already used!
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test' user 'monetdb' password 'monetdb'
language 'sql';
+ERROR = !CONNECT TO: this connection already exists or the db_alias 'test' was
already used!
+MAPI = mone...@alviss:32496
+QUERY = connect to 'localhost' port 4000 database 'dmo' as 'test_db' user
'monetdb' password 'monetdb' language 'sql';
+ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db'
was already used!
+MAPI = mone...@alviss:32496
+QUERY = disconnect 'test_db';
+ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db'
+MAPI = mone...@alviss:32496
+QUERY = disconnect 'test_tb';
+ERROR = !DISCONNECT CATALOG: no such db_alias 'test_tb'
+
+server 12, client 3
+#client1
+
# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
# builtin opt gdk_version = 1.27.0
# builtin opt monet_pid = 6194
@@ -78,8 +127,6 @@
#warning: please don't forget to set your vault key!
#(see /ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5/etc/monetdb5.conf)
-server 12
-#remote mserver
# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
# builtin opt gdk_version = 1.27.0
# builtin opt monet_pid = 6199
@@ -150,51 +197,6 @@
#warning: please don't forget to set your vault key!
#(see /ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5/etc/monetdb5.conf)
-server 12, client 1
-#client1
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' port 34 database
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password
'monetdb' language 'sql';
-ERROR = !IOException:mapi.connect:Could not connect: initiating connection on
socket failed: Connection refused
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test_db_1' language 'sql';
-ERROR = !syntax error, unexpected LANGUAGE, expecting USER in: "connect to
'localhost' port 32497 database 'mTests_src_test_Connections_test1' as
'test_db_1' language"
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' database 'mTests_src_test_Connections_test1';
-ERROR = !syntax error, unexpected SCOLON, expecting USER in: "connect to
'localhost' database 'mTests_src_test_Connections_test1';"
-MAPI = mone...@alviss:32496
-QUERY = connect 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password
'monetdb' language 'sql';
-ERROR = !syntax error, unexpected STRING, expecting TO in: "connect
'localhost'"
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' port 32497 as 'test_db_1' user 'monetdb'
password 'monetdb' language 'sql';
-ERROR = !syntax error, unexpected AS, expecting DATABASE in: "connect to
'localhost' port 32497 as"
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' language 'sql';
-ERROR = !syntax error, unexpected LANGUAGE, expecting PASSWORD in: "connect to
'localhost' port 32497 database 'mTests_src_test_Connections_test1' as
'test_db' user 'monetdb' language"
-MAPI = mone...@alviss:32496
-QUERY = disconnect 'test_db_1';
-ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db_1'
-
-server 12, client 2
-#client1
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' port 32498 database
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' password
'monetdb' language 'sql';
-ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db'
was already used!
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' port 32497 database
'mTests_src_test_Connections_test1' as 'test' user 'monetdb' password 'monetdb'
language 'sql';
-ERROR = !CONNECT TO: this connection already exists or the db_alias 'test' was
already used!
-MAPI = mone...@alviss:32496
-QUERY = connect to 'localhost' port 4000 database 'dmo' as 'test_db' user
'monetdb' password 'monetdb' language 'sql';
-ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db'
was already used!
-MAPI = mone...@alviss:32496
-QUERY = disconnect 'test_db';
-ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db'
-MAPI = mone...@alviss:32496
-QUERY = disconnect 'test_tb';
-ERROR = !DISCONNECT CATALOG: no such db_alias 'test_tb'
-
-server 12, client 3
-#client1
-
# 17:56:55 >
# 17:56:55 > Done.
# 17:56:55 >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
