Changeset: 4a4ac739112b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a4ac739112b
Modified Files:
sql/test/Users/Tests/schemaRights.SQL.py
Branch: mtest
Log Message:
convert tests for schemaRights
diffs (100 lines):
diff --git a/sql/test/Users/Tests/schemaRights.SQL.py
b/sql/test/Users/Tests/schemaRights.SQL.py
--- a/sql/test/Users/Tests/schemaRights.SQL.py
+++ b/sql/test/Users/Tests/schemaRights.SQL.py
@@ -4,40 +4,68 @@
# Verify that the user can DROP SCHEMA created by both the 'monetdb' user and
the created user.
###
-import os, sys
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
+
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ tc.connect(username="monetdb", password="monetdb")
+ tc.execute("""
+ CREATE USER user1 WITH PASSWORD 'user1' name 'schema test user1' schema
sys;
+ CREATE USER user2 WITH PASSWORD 'user2' name 'schema test user2' schema
sys;
+ GRANT sysadmin TO user1;
+ GRANT sysadmin TO user2;
+ CREATE SCHEMA schema1 AUTHORIZATION sysadmin;
+ """).assertSucceeded()
+
+ tc.connect(username='user1', password='user1')
+ tc.execute("""
+ SET ROLE sysadmin;
+ DROP SCHEMA schema1;
+ CREATE SCHEMA schema2;
+ DROP SCHEMA schema2;
+ CREATE SCHEMA schema3;
+ """).assertSucceeded()
-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()
+ tc.connect(username='user2', password='user2')
+ tc.execute("""
+ SET ROLE sysadmin;
+ DROP SCHEMA schema3;
+ """).assertSucceeded()
+
+# import os, sys
+# try:
+# from MonetDBtesting import process
+# except ImportError:
+# import process
-sql_test_client('monetdb', 'monetdb', input="""\
-CREATE USER user1 WITH PASSWORD 'user1' name 'schema test user1' schema sys;
-CREATE USER user2 WITH PASSWORD 'user2' name 'schema test user2' schema sys;
-GRANT sysadmin TO user1;
-GRANT sysadmin TO user2;
-CREATE SCHEMA schema1 AUTHORIZATION sysadmin;
-""")
+# 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()
+
+# sql_test_client('monetdb', 'monetdb', input="""\
+# CREATE USER user1 WITH PASSWORD 'user1' name 'schema test user1' schema sys;
+# CREATE USER user2 WITH PASSWORD 'user2' name 'schema test user2' schema sys;
+# GRANT sysadmin TO user1;
+# GRANT sysadmin TO user2;
+# CREATE SCHEMA schema1 AUTHORIZATION sysadmin;
+# """)
-sql_test_client('user1', 'user1', input="""\
-SET ROLE sysadmin;
-DROP SCHEMA schema1;
-CREATE SCHEMA schema2;
-DROP SCHEMA schema2;
-CREATE SCHEMA schema3;
-""")
+# sql_test_client('user1', 'user1', input="""\
+# SET ROLE sysadmin;
+# DROP SCHEMA schema1;
+# CREATE SCHEMA schema2;
+# DROP SCHEMA schema2;
+# CREATE SCHEMA schema3;
+# """)
-sql_test_client('user2', 'user2', input="""\
-SET ROLE sysadmin;
-DROP SCHEMA schema3;
-""")
+# sql_test_client('user2', 'user2', input="""\
+# SET ROLE sysadmin;
+# DROP SCHEMA schema3;
+# """)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
