Changeset: f546d7a623eb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f546d7a623eb
Modified Files:
        sql/test/Users/Tests/test_privs_p1.SQL.py
        sql/test/Users/Tests/test_privs_p2.SQL.py
        sql/test/Users/Tests/test_privs_p2.stable.err
Branch: mtest
Log Message:

converted 2 more python tests


diffs (110 lines):

diff --git a/sql/test/Users/Tests/test_privs_p1.SQL.py 
b/sql/test/Users/Tests/test_privs_p1.SQL.py
--- a/sql/test/Users/Tests/test_privs_p1.SQL.py
+++ b/sql/test/Users/Tests/test_privs_p1.SQL.py
@@ -5,12 +5,15 @@
 import os, sys
 import pymonetdb
 
-
 db=os.getenv("TSTDB")
 port=int(os.getenv("MAPIPORT"))
 client = pymonetdb.connect(database=db, port=port, autocommit=True, 
user='my_user', password='p1')
 cursor = client.cursor()
 
+def error(msg):
+    print(msg)
+    sys.exit(-1)
+
 nr=cursor.execute("select * from test")
 if nr != 0:
     error("expected empty result")
diff --git a/sql/test/Users/Tests/test_privs_p2.SQL.py 
b/sql/test/Users/Tests/test_privs_p2.SQL.py
--- a/sql/test/Users/Tests/test_privs_p2.SQL.py
+++ b/sql/test/Users/Tests/test_privs_p2.SQL.py
@@ -3,14 +3,42 @@
 ###
 
 import os, sys
+import pymonetdb
+
+
+db=os.getenv("TSTDB")
+port=int(os.getenv("MAPIPORT"))
+client = pymonetdb.connect(database=db, port=port, autocommit=True, 
user='my_user2', password='p2')
+cursor = client.cursor()
+
+err=0
 try:
-    from MonetDBtesting import process
-except ImportError:
-    import process
+    nr=cursor.execute("select * from test")
+except:
+    err=1
+    pass
 
-with process.client('sql', user='my_user2', passwd='p2',
-                    stdin=open(os.path.join(os.getenv('RELSRCDIR'), os.pardir, 
'test_privs.sql')),
-                    stdout=process.PIPE, stderr=process.PIPE) as clt:
-    out, err = clt.communicate()
-    sys.stdout.write(out)
-    sys.stderr.write(err)
+try:
+    rowaffected=cursor.execute("insert into test values(1,1)")
+except:
+    err=err+2
+    pass
+
+try:
+    rowaffected=cursor.execute("update test set b = 2")
+except:
+    err=err+4
+    pass
+
+try:
+    rowaffected=cursor.execute("delete from test")
+except:
+    err=err+8
+    pass
+
+if err != 15:
+    print("User should have no access too this table\n")
+    sys.exit(-1)
+
+cursor.close()
+client.close()
diff --git a/sql/test/Users/Tests/test_privs_p2.stable.err 
b/sql/test/Users/Tests/test_privs_p2.stable.err
--- a/sql/test/Users/Tests/test_privs_p2.stable.err
+++ b/sql/test/Users/Tests/test_privs_p2.stable.err
@@ -24,28 +24,7 @@ stderr of test 'test_privs_p2` in direct
 # cmdline opt  gdk_dbpath = 
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_Users
 # cmdline opt  mal_listing = 0
 
-# 13:35:21 >  
-# 13:35:21 >  "/usr/bin/python2" "test_privs_p2.SQL.py" "test_privs_p2"
-# 13:35:21 >  
+# 14:22:23 >  
+# 14:22:23 >  "Done."
+# 14:22:23 >  
 
-MAPI  = (my_user2) /var/tmp/mtest-14654/.s.monetdb.35552
-QUERY = select * from test;
-ERROR = !SELECT: access denied for my_user2 to table 'my_schema.test'
-CODE  = 42000
-MAPI  = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
-QUERY = insert into test values(1,1);
-ERROR = !INSERT INTO: insufficient privileges for user 'my_user2' to insert 
into table 'test'
-CODE  = 42000
-MAPI  = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
-QUERY = update test set b = 2;
-ERROR = !UPDATE: insufficient privileges for user 'my_user2' to update table 
'test' on column 'b'
-CODE  = 42000
-MAPI  = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
-QUERY = delete from test;
-ERROR = !DELETE FROM: insufficient privileges for user 'my_user2' to delete 
from table 'test'
-CODE  = 42000
-
-# 13:35:21 >  
-# 13:35:21 >  "Done."
-# 13:35:21 >  
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to