Changeset: 0f17520b010e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f17520b010e
Removed Files:
sql/test/Users/Tests/changePasswordUser.reqtests
Modified Files:
sql/test/Users/Tests/All
sql/test/Users/Tests/changePasswordUser.SQL.py
sql/test/Users/Tests/unknown_user.SQL.py
Branch: default
Log Message:
clean up
diffs (111 lines):
diff --git a/sql/test/Users/Tests/All b/sql/test/Users/Tests/All
--- a/sql/test/Users/Tests/All
+++ b/sql/test/Users/Tests/All
@@ -6,12 +6,12 @@ unknown_user
withGrantOption
grantMonetdb
columnRights
-createSetUp
changePasswordUser
-renameUser
-changeSchemaUser
copyinto
schemaRights
metadataConsistency
createUserRollback
userCallFunction
+createSetUp
+renameUser
+changeSchemaUser
diff --git a/sql/test/Users/Tests/changePasswordUser.SQL.py
b/sql/test/Users/Tests/changePasswordUser.SQL.py
--- a/sql/test/Users/Tests/changePasswordUser.SQL.py
+++ b/sql/test/Users/Tests/changePasswordUser.SQL.py
@@ -10,59 +10,26 @@ logging.basicConfig(level=logging.FATAL)
with SQLTestCase() as tc:
tc.connect(username="monetdb", password="monetdb")
+ tc.execute("CREATE USER april WITH PASSWORD 'april' NAME 'april' SCHEMA
sys;").assertSucceeded()
+ tc.connect(username="april", password="april")
+ tc.execute("select current_user, 'password is
\"april\"';").assertSucceeded()\
+ .assertDataResultMatch([("april", "password is \"april\"",)])
+
+ tc.connect(username="monetdb", password="monetdb")
tc.execute("ALTER USER april WITH UNENCRYPTED PASSWORD
'april2';").assertSucceeded()
tc.connect(username="april", password="april")
- tc.execute("select 'password april';").assertFailed()
+ tc.execute("select 'password incorrect
april';").assertFailed(err_code=None,
err_message="InvalidCredentialsException:checkCredentials:invalid credentials
for user 'april'")
tc.connect(username="april", password="april2")
- tc.execute("select 'password april2';")\
- .assertSucceeded()\
- .assertRowCount(1).assertDataResultMatch([("password april2",)])
+ tc.execute("select 'password correct april2';").assertSucceeded()\
+ .assertDataResultMatch([("password correct april2",)])
+ # april tries to change its password with an incorrect old password
tc.execute("ALTER USER SET UNENCRYPTED PASSWORD 'april5' USING OLD
PASSWORD 'april3';")\
- .assertFailed(err_message='ALTER USER: Access denied')
+ .assertFailed(err_code="M0M27", err_message='ALTER USER: Access
denied')
tc.execute("ALTER USER SET UNENCRYPTED PASSWORD 'april' USING OLD PASSWORD
'april2';").assertSucceeded()
tc.connect(username="april", password="april2")
tc.execute("select 'password april2 (wrong!!!)';").assertFailed()
tc.connect(username="april", password="april")
- tc.execute("select 'password change
successfully';").assertSucceeded().assertRowCount(1).assertDataResultMatch([("password
change successfully",)])
-
-# import os, sys
-# try:
-# from MonetDBtesting import process
-# except ImportError:
-# import process
-
-# 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="""\
-# ALTER USER april WITH UNENCRYPTED PASSWORD 'april2';
-# """)
+ tc.execute("select 'password change
successfully';").assertSucceeded().assertDataResultMatch([("password change
successfully",)])
-# # try to log in with old password
-# sql_test_client('april', 'april', input="""\
-# select 'password april';
-# """)
-
-# # try to log in with new password
-# sql_test_client('april', 'april2', input="""\
-# select 'password april2';
-# ALTER USER SET UNENCRYPTED PASSWORD 'april5' USING OLD PASSWORD 'april3';
-# ALTER USER SET UNENCRYPTED PASSWORD 'april' USING OLD PASSWORD 'april2';
-# """)
-
-# # try to log in with old password
-# sql_test_client('april', 'april2', input="""\
-# select 'password april2 (wrong!!!)';
-# """)
-
-
-# # try to log in with the new password
-# sql_test_client('april', 'april', input="""\
-# select 'password change successfully';
-# """)
-
-
-
+ tc.connect(username="monetdb", password="monetdb")
+ tc.execute("DROP USER april;").assertSucceeded()
diff --git a/sql/test/Users/Tests/changePasswordUser.reqtests
b/sql/test/Users/Tests/changePasswordUser.reqtests
deleted file mode 100644
--- a/sql/test/Users/Tests/changePasswordUser.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-createSetUp
diff --git a/sql/test/Users/Tests/unknown_user.SQL.py
b/sql/test/Users/Tests/unknown_user.SQL.py
--- a/sql/test/Users/Tests/unknown_user.SQL.py
+++ b/sql/test/Users/Tests/unknown_user.SQL.py
@@ -26,3 +26,5 @@ with SQLTestCase() as tc:
tc.execute("GRANT COPY INTO TO "+usr).assertFailed(err_code="01007",
err_message="GRANT: User/role '"+usr+"' unknown")
tc.execute("GRANT COPY FROM TO "+usr).assertFailed(err_code="01007",
err_message="GRANT: User/role '"+usr+"' unknown")
+ tc.execute("DROP TABLE t;").assertSucceeded()
+ tc.execute("DROP ROLE r1;").assertSucceeded()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
