Changeset: 6b476665647a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b476665647a
Modified Files:
sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
Branch: mtest
Log Message:
converted test to not output, unless we get some unexpected behaviour
diffs (134 lines):
diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
@@ -4,36 +4,50 @@
###
import os, sys
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
+import pymonetdb
+
+def error(msg):
+ print(msg)
+ sys.exit(-1)
-def sql_test_client(user, passwd, input):
- with process.client(lang="sql", user=user, passwd=passwd, communicate=True,
- stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE,
- input=input, port=int(os.getenv("MAPIPORT"))) as c:
- c.communicate()
+db=os.getenv("TSTDB")
+port=int(os.getenv("MAPIPORT"))
+client = pymonetdb.connect(database=db, port=port, autocommit=True,
user='monetdb', password='monetdb')
+cursor = client.cursor()
+
+cursor.execute("CREATE SCHEMA newSchema");
-sql_test_client('monetdb', 'monetdb', input="""\
-CREATE SCHEMA newSchema;
-select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
+cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left
outer join "sys"."schemas" s on u.default_schema = s.id""")
+users=cursor.fetchall()
+if (users[0][0] != 'monetdb'):
+ error('MonetDB user missing')
+if (users[1][0] != '.snapshot'):
+ error('.snapshot user missing')
-CREATE USER user1 with password '1' name '1st user' schema newSchema;
-CREATE USER user2 with password '2' name '2nd user' schema newSchema;
-CREATE USER user3 with password '3' name '3rd user' schema newSchema;
-CREATE USER user4 with password '4' name '4th user' schema newSchema;
-
-select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
+cursor.execute("CREATE USER user1 with password '1' name '1st user' schema
newSchema");
+cursor.execute("CREATE USER user2 with password '2' name '2nd user' schema
newSchema");
+cursor.execute("CREATE USER user3 with password '3' name '3rd user' schema
newSchema");
+cursor.execute("CREATE USER user4 with password '4' name '4th user' schema
newSchema");
-DROP USER user1;
-DROP USER user2;
-DROP USER user3;
-DROP USER user4;
+cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left
outer join "sys"."schemas" s on u.default_schema = s.id""")
+users=cursor.fetchall()
+if (users[2][0] != 'user1'):
+ error('user1 user missing')
+if (users[3][0] != 'user2'):
+ error('user2 user missing')
+if (users[4][0] != 'user3'):
+ error('user3 user missing')
+if (users[5][0] != 'user4'):
+ error('user4 user missing')
-select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
-""")
+cursor.execute("DROP USER user1")
+cursor.execute("DROP USER user2")
+cursor.execute("DROP USER user3")
+cursor.execute("DROP USER user4")
-
+cursor.execute("""select u.name, u.fullname, s.name from "sys"."users" u left
outer join "sys"."schemas" s on u.default_schema = s.id""")
+if len(cursor.fetchall()) != 2:
+ error('users not correctly dropped')
-
+cursor.close()
+client.close()
diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
@@ -50,47 +50,7 @@ stdout of test 'dropManyUsers.Bug-3764`
# loading sql script: 99_system.sql
# MonetDB/SQL module loaded
-
-# 14:28:37 >
-# 14:28:37 > "/usr/bin/python2" "dropManyUsers.SQL.py" "dropManyUsers"
-# 14:28:37 >
+# 16:59:15 >
+# 16:59:15 > "Done."
+# 16:59:15 >
-#CREATE SCHEMA newSchema;
-#select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
-% .u, .u, .s # table_name
-% name, fullname, name # name
-% varchar, varchar, varchar # type
-% 9, 13, 3 # length
-[ "monetdb", "MonetDB Admin", "sys" ]
-[ ".snapshot", "Snapshot User", "sys" ]
-#CREATE USER user1 with password '1' name '1st user' schema newSchema;
-#CREATE USER user2 with password '2' name '2nd user' schema newSchema;
-#CREATE USER user3 with password '3' name '3rd user' schema newSchema;
-#CREATE USER user4 with password '4' name '4th user' schema newSchema;
-#select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
-% .u, .u, .s # table_name
-% name, fullname, name # name
-% varchar, varchar, varchar # type
-% 9, 13, 9 # length
-[ "monetdb", "MonetDB Admin", "sys" ]
-[ ".snapshot", "Snapshot User", "sys" ]
-[ "user1", "1st user", "newschema" ]
-[ "user2", "2nd user", "newschema" ]
-[ "user3", "3rd user", "newschema" ]
-[ "user4", "4th user", "newschema" ]
-#DROP USER user1;
-#DROP USER user2;
-#DROP USER user3;
-#DROP USER user4;
-#select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
-% .u, .u, .s # table_name
-% name, fullname, name # name
-% varchar, varchar, varchar # type
-% 9, 13, 3 # length
-[ "monetdb", "MonetDB Admin", "sys" ]
-[ ".snapshot", "Snapshot User", "sys" ]
-
-# 14:28:37 >
-# 14:28:37 > "Done."
-# 14:28:37 >
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
