[CLIENT-2305] Fix negative test cases not raising client exception

test/new_tests/test_admin_change_password.py

@@ -77,12 +77,10 @@ def test_change_password_with_invalid_timeout_policy_value(self):
         user = "testchangepassworduser"
         password = "newpassword"
 
-        try:
+        with pytest.raises(aerospike.exception.ParamError) as excinfo:
             self.client.admin_change_password(user, password, policy)
-
-        except aerospike.exception.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "timeout is invalid"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "timeout is invalid"
 
     # NOTE: This will fail if auth_mode is PKI_AUTH (3).
     @pytest.mark.xfail(reason="Might fail depending on auth_mode.")
@@ -116,24 +114,20 @@ def test_change_password_with_none_username(self):
         user = None
         password = "newpassword"
 
-        try:
+        with pytest.raises(aerospike.exception.ParamError) as excinfo:
             self.client.admin_change_password(user, password)
-
-        except aerospike.exception.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Username should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Username should be a string"
 
     def test_change_password_with_none_password(self):
 
         user = "testchangepassworduser"
         password = None
 
-        try:
+        with pytest.raises(aerospike.exception.ParamError) as excinfo:
             self.client.admin_change_password(user, password)
-
-        except aerospike.exception.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Password should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Password should be a string"
 
     def test_change_password_with_non_existent_user(self):
 

test/new_tests/test_admin_create_role.py

@@ -250,11 +250,10 @@ def test_create_role_incorrect_role_type(self):
         """
         role name not string
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_create_role(1, [{"code": aerospike.PRIV_USER_ADMIN}])
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert "Role name should be a string" in exception.msg
+        assert excinfo.value.code == -2
+        assert "Role name should be a string" in excinfo.value.msg
 
     def test_create_role_unknown_privilege_type(self):
         """
@@ -277,12 +276,10 @@ def test_create_role_incorrect_privilege_type(self):
         """
         privilege type incorrect
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_create_role("usr-sys-admin-test", None)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Privileges should be a list"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Privileges should be a list"
 
     def test_create_role_existing_role(self):
         """
@@ -303,7 +300,6 @@ def test_create_role_existing_role(self):
             self.client.admin_create_role(
                 "usr-sys-admin-test", [{"code": aerospike.PRIV_USER_ADMIN}, {"code": aerospike.PRIV_SYS_ADMIN}]
             )
-
         except e.RoleExistsError as exception:
             assert exception.code == 71
             assert exception.msg == "AEROSPIKE_ROLE_ALREADY_EXISTS"

test/new_tests/test_admin_create_user.py

@@ -108,12 +108,10 @@ def test_create_user_with_invalid_timeout_policy_value(self):
         except Exception:
             pass
 
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_create_user(user, password, roles, policy)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "timeout is invalid"
+            assert excinfo.value.code == -2
+            assert excinfo.value.msg == "timeout is invalid"
 
     def test_create_user_with_proper_timeout_policy_value(self):
 
@@ -146,12 +144,10 @@ def test_create_user_with_none_username(self):
         password = "user3-test"
         roles = ["sys-admin"]
 
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_create_user(user, password, roles)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Username should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Username should be a string"
 
     def test_create_user_with_empty_username(self):
 
@@ -190,12 +186,10 @@ def test_create_user_with_none_password(self):
         password = None
         roles = ["sys-admin"]
 
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_create_user(user, password, roles)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Password should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Password should be a string"
 
     def test_create_user_with_empty_string_as_password(self):
 

test/new_tests/test_admin_drop_role.py

@@ -136,12 +136,10 @@ def test_drop_role_rolename_None(self):
         """
         Drop role with role name None
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_drop_role(None)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Role name should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Role name should be a string"
 
     def test_drop_role_with_incorrect_policy(self):
         """
@@ -151,12 +149,12 @@ def test_drop_role_with_incorrect_policy(self):
 
         assert status == 0
         time.sleep(3)
-        try:
+
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_drop_role("usr-sys-admin-test", {"timeout": 0.2})
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "timeout is invalid"
 
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "timeout is invalid"
         try:
             self.client.admin_drop_role("usr-sys-admin-test")
         except Exception:

test/new_tests/test_admin_drop_user.py

@@ -76,12 +76,10 @@ def test_drop_user_with_user_none(self):
         """
         Invoke drop_user() with policy none
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_drop_user(None)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Username should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Username should be a string"
 
     def test_drop_user_positive(self):
         """
@@ -175,12 +173,10 @@ def test_drop_user_policy_incorrect(self):
 
         assert user_details["roles"] == ["read", "read-write", "sys-admin"]
         policy = {"timeout": 0.2}
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             status = self.client.admin_drop_user(user, policy)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "timeout is invalid"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "timeout is invalid"
 
         status = self.client.admin_drop_user(user)
 

test/new_tests/test_admin_get_role.py

@@ -92,9 +92,7 @@ def test_admin_get_role_incorrect_role_type(self):
         """
         Incorrect role type
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_get_role(None)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Role name should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Role name should be a string"

test/new_tests/test_admin_get_roles.py

@@ -75,9 +75,7 @@ def test_admin_get_roles_incorrect_policy(self):
         """
         Get roles incorrect policy
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_get_roles({"timeout": 0.2})
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "timeout is invalid"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "timeout is invalid"

test/new_tests/test_admin_grant_privileges.py

@@ -167,12 +167,10 @@ def test_grant_privileges_incorrect_role_type(self):
         """
         role name not string
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_grant_privileges(1, [{"code": aerospike.PRIV_USER_ADMIN}])
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Role name should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Role name should be a string"
 
     def test_grant_privileges_unknown_privilege_type(self):
         """
@@ -187,12 +185,10 @@ def test_grant_privileges_incorrect_privilege_type(self):
         """
         privilege type incorrect
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_grant_privileges("usr-sys-admin-test", None)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Privileges should be a list"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Privileges should be a list"
 
     def test_grant_privileges_empty_list_privileges(self):
         """

test/new_tests/test_admin_grant_roles.py

@@ -88,12 +88,10 @@ def test_grant_roles_with_invalid_timeout_policy_value(self):
         user = "example-test"
         roles = ["sys-admin"]
 
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_grant_roles(user, roles, policy)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "timeout is invalid"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "timeout is invalid"
 
     def test_grant_roles_with_proper_timeout_policy_value(self):
 
@@ -115,12 +113,10 @@ def test_grant_roles_with_none_username(self):
         user = None
         roles = ["sys-admin"]
 
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_grant_roles(user, roles)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Username should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Username should be a string"
 
     def test_grant_roles_with_empty_username(self):
 

test/new_tests/test_admin_query_role.py

@@ -82,9 +82,7 @@ def test_admin_query_role_incorrect_role_type(self):
         """
         Incorrect role type
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_query_role(None)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Role name should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Role name should be a string"

test/new_tests/test_admin_query_roles.py

@@ -65,9 +65,7 @@ def test_admin_query_roles_incorrect_policy(self):
         """
         Query roles incorrect policy
         """
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_query_roles({"timeout": 0.2})
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "timeout is invalid"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "timeout is invalid"

test/new_tests/test_admin_query_user_info.py

@@ -93,34 +93,28 @@ def test_query_user_info_with_none_username(self):
 
         user = None
 
-        try:
+        with pytest.raises(e.ParamError) as excinfo:
             self.client.admin_query_user_info(user)
-
-        except e.ParamError as exception:
-            assert exception.code == -2
-            assert exception.msg == "Username should be a string"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "Username should be a string"
 
     def test_query_user_info_with_empty_username(self):
 
         user = ""
 
-        try:
+        with pytest.raises(e.InvalidUser) as excinfo:
             self.client.admin_query_user_info(user)
-
-        except e.InvalidUser as exception:
-            assert exception.code == 60
-            assert exception.msg == "AEROSPIKE_INVALID_USER"
+        assert excinfo.value.code == 60
+        assert excinfo.value.msg == "AEROSPIKE_INVALID_USER"
 
     def test_query_user_info_with_nonexistent_username(self):
 
         user = "non-existent"
 
-        try:
+        with pytest.raises(e.InvalidUser) as excinfo:
             self.client.admin_query_user_info(user)
-
-        except e.InvalidUser as exception:
-            assert exception.code == 60
-            assert exception.msg == "AEROSPIKE_INVALID_USER"
+        assert excinfo.value.code == 60
+        assert excinfo.value.msg == "AEROSPIKE_INVALID_USER"
 
     def test_query_user_info_with_no_roles(self):
 
@@ -148,9 +142,7 @@ def test_query_user_info_with_policy_as_string(self):
         Invoke query_user() with policy as string
         """
         policy = ""
-        try:
+        with pytest.raises(e.AerospikeError) as excinfo:
             self.client.admin_query_user_info("foo", policy)
-
-        except e.AerospikeError as exception:
-            assert exception.code == -2
-            assert exception.msg == "policy must be a dict"
+        assert excinfo.value.code == -2
+        assert excinfo.value.msg == "policy must be a dict"