[chore] Sync legacy tests with main - do not revert

Legacy tests under tests/ are kept in sync with main branch.
V9-specific tests live under tests_v9/.

Made-with: Cursor

Author: Aryamanz29

tests/unit/aio/test_audit_search.py

@@ -47,21 +47,23 @@ def load_json(filename):
 async def _assert_audit_search_results(
     results: AsyncAuditSearchResults, response_json, sorts, bulk=False
 ):
-    first = response_json["entityAudits"][0]
     async for audit in results:
-        assert audit.entity_id == first["entityId"]
-        assert audit.entity_qualified_name == first["entityQualifiedName"]
-        assert audit.type_name == first["typeName"]
+        assert audit.entity_id == response_json["entityAudits"][0]["entity_id"]
+        assert (
+            audit.entity_qualified_name
+            == response_json["entityAudits"][0]["entity_qualified_name"]
+        )
+        assert audit.type_name == response_json["entityAudits"][0]["type_name"]
         expected_timestamp = datetime.fromtimestamp(
-            first["timestamp"] / 1000, tz=timezone.utc
+            response_json["entityAudits"][0]["timestamp"] / 1000, tz=timezone.utc
         )
         assert audit.timestamp == expected_timestamp
         expected_created = datetime.fromtimestamp(
-            first["created"] / 1000, tz=timezone.utc
+            response_json["entityAudits"][0]["created"] / 1000, tz=timezone.utc
         )
         assert audit.created == expected_created
-        assert audit.user == first["user"]
-        assert audit.action == first["action"]
+        assert audit.user == response_json["entityAudits"][0]["user"]
+        assert audit.action == response_json["entityAudits"][0]["action"]
 
     assert results.total_count == response_json["totalCount"]
     assert results._bulk == bulk

tests/unit/aio/test_client.py

@@ -8,6 +8,7 @@
 
 import pytest
 from httpx import Headers
+from pydantic.v1 import ValidationError
 
 from pyatlan.client.aio.asset import AsyncAssetClient
 from pyatlan.client.aio.batch import AsyncBatch
@@ -2140,7 +2141,7 @@ async def test_asset_client_missing_glossary_guid_raises_invalid_request_error(
 async def test_asset_client_methods_validation_error(client, method, params):
     client_method = getattr(client.asset, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2150,7 +2151,7 @@ async def test_asset_client_methods_validation_error(client, method, params):
 async def test_admin_client_methods_validation_error(client, method, params):
     client_method = getattr(client.admin, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2160,7 +2161,7 @@ async def test_admin_client_methods_validation_error(client, method, params):
 async def test_async_audit_client_methods_validation_error(client, method, params):
     client_method = getattr(client.audit, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2170,7 +2171,7 @@ async def test_async_audit_client_methods_validation_error(client, method, param
 async def test_async_group_client_methods_validation_error(client, method, params):
     client_method = getattr(client.group, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2180,7 +2181,7 @@ async def test_async_group_client_methods_validation_error(client, method, param
 async def test_role_client_methods_validation_error(client, method, params):
     client_method = getattr(client.role, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2190,7 +2191,7 @@ async def test_role_client_methods_validation_error(client, method, params):
 async def test_async_search_log_client_methods_validation_error(client, method, params):
     client_method = getattr(client.search_log, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2200,7 +2201,7 @@ async def test_async_search_log_client_methods_validation_error(client, method,
 async def test_async_token_client_methods_validation_error(client, method, params):
     client_method = getattr(client.token, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2210,7 +2211,7 @@ async def test_async_token_client_methods_validation_error(client, method, param
 async def test_async_typedef_client_methods_validation_error(client, method, params):
     client_method = getattr(client.typedef, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 
@@ -2220,7 +2221,7 @@ async def test_async_typedef_client_methods_validation_error(client, method, par
 async def test_async_user_client_methods_validation_error(client, method, params):
     client_method = getattr(client.user, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValidationError) as err:
             await client_method(*param_values)
         assert error_msg in str(err.value)
 

tests/unit/aio/test_credential_client.py

@@ -3,6 +3,7 @@
 from unittest.mock import Mock
 
 import pytest
+from pydantic.v1 import ValidationError
 
 from pyatlan.client.aio.credential import AsyncCredentialClient
 from pyatlan.client.common import AsyncApiCaller
@@ -21,20 +22,12 @@
     "ATLAN-PYTHON-400-054 Credentials provided did not work: failed"
 )
 TEST_INVALID_GUID_GET_VALIDATION_ERR = (
-    "1 validation error for Get\nguid\n  str type expected"
-)
-TEST_INVALID_GUID_PURGE_BY_GUID_VALIDATION_ERR = (
-    "1 validation error for PurgeByGuid\nguid\n  str type expected"
-)
-TEST_INVALID_CRED_TEST_VALIDATION_ERR = (
-    "1 validation error for Test\ncredential\n  value is not a valid dict"
-)
-TEST_INVALID_CRED_TEST_UPDATE_VALIDATION_ERR = (
-    "1 validation error for TestAndUpdate\ncredential\n  value is not a valid dict"
-)
-TEST_INVALID_CRED_CREATOR_VALIDATION_ERR = (
-    "1 validation error for Creator\ncredential\n  value is not a valid dict"
+    "1 validation error for Get\nguid\n  str type expected (type=type_error.str)"
 )
+TEST_INVALID_GUID_PURGE_BY_GUID_VALIDATION_ERR = "1 validation error for PurgeByGuid\nguid\n  str type expected (type=type_error.str)"
+TEST_INVALID_CRED_TEST_VALIDATION_ERR = "1 validation error for Test\ncredential\n  value is not a valid dict (type=type_error.dict)"
+TEST_INVALID_CRED_TEST_UPDATE_VALIDATION_ERR = "1 validation error for TestAndUpdate\ncredential\n  value is not a valid dict (type=type_error.dict)"
+TEST_INVALID_CRED_CREATOR_VALIDATION_ERR = "1 validation error for Creator\ncredential\n  value is not a valid dict (type=type_error.dict)"
 TEST_INVALID_API_CALLER_PARAMETER_TYPE = (
     "ATLAN-PYTHON-400-048 Invalid parameter type for client should be AsyncApiCaller"
 )
@@ -102,29 +95,29 @@ async def test_init_when_wrong_class_raises_exception(test_api_caller):
 async def test_cred_get_wrong_params_raises_validation_error(
     test_guid, client: AsyncCredentialClient
 ):
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         await client.get(guid=test_guid)
-    assert TEST_INVALID_GUID_GET_VALIDATION_ERR in str(err.value)
+    assert TEST_INVALID_GUID_GET_VALIDATION_ERR == str(err.value)
 
 
 @pytest.mark.parametrize("test_credentials", ["invalid_cred", 123])
 @pytest.mark.asyncio
 async def test_cred_test_wrong_params_raises_validation_error(
     test_credentials, client: AsyncCredentialClient
 ):
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         await client.test(credential=test_credentials)
-    assert TEST_INVALID_CRED_TEST_VALIDATION_ERR in str(err.value)
+    assert TEST_INVALID_CRED_TEST_VALIDATION_ERR == str(err.value)
 
 
 @pytest.mark.parametrize("test_credentials", ["invalid_cred", 123])
 @pytest.mark.asyncio
 async def test_cred_test_and_update_wrong_params_raises_validation_error(
     test_credentials, client: AsyncCredentialClient
 ):
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         await client.test_and_update(credential=test_credentials)
-    assert TEST_INVALID_CRED_TEST_UPDATE_VALIDATION_ERR in str(err.value)
+    assert TEST_INVALID_CRED_TEST_UPDATE_VALIDATION_ERR == str(err.value)
 
 
 @pytest.mark.parametrize(
@@ -264,7 +257,7 @@ async def test_cred_get_all_invalid_response(mock_api_caller):
 async def test_cred_get_all_invalid_params_raises_validation_error(
     test_filter, test_limit, test_offset, client: AsyncCredentialClient
 ):
-    with pytest.raises(ValueError):
+    with pytest.raises(ValidationError):
         await client.get_all(filter=test_filter, limit=test_limit, offset=test_offset)
 
 
@@ -305,7 +298,7 @@ async def test_cred_get_all_partial_response(mock_api_caller):
 async def test_cred_get_all_invalid_filter_type(mock_api_caller):
     client = AsyncCredentialClient(mock_api_caller)
 
-    with pytest.raises(ValueError, match="value is not a valid dict"):
+    with pytest.raises(ValidationError, match="value is not a valid dict"):
         await client.get_all(filter="invalid_filter")
 
 
@@ -326,9 +319,9 @@ async def test_cred_get_all_no_results(mock_api_caller):
 async def test_cred_creator_wrong_params_raises_validation_error(
     create_credentials, client: AsyncCredentialClient
 ):
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         await client.creator(credential=create_credentials)
-    assert TEST_INVALID_CRED_CREATOR_VALIDATION_ERR in str(err.value)
+    assert TEST_INVALID_CRED_CREATOR_VALIDATION_ERR == str(err.value)
 
 
 @pytest.mark.parametrize(
@@ -407,9 +400,9 @@ async def test_cred_creator_with_test_false_with_username_password(
 async def test_cred_purge_by_guid_wrong_params_raises_validation_error(
     test_guid, client: AsyncCredentialClient
 ):
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         await client.purge_by_guid(guid=test_guid)
-    assert TEST_INVALID_GUID_PURGE_BY_GUID_VALIDATION_ERR in str(err.value)
+    assert TEST_INVALID_GUID_PURGE_BY_GUID_VALIDATION_ERR == str(err.value)
 
 
 @pytest.mark.asyncio

tests/unit/aio/test_file_client.py

@@ -6,6 +6,7 @@
 from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
+from pydantic.v1 import ValidationError
 
 from pyatlan.client.aio.client import AsyncAtlanClient
 from pyatlan.client.aio.file import AsyncFileClient
@@ -163,7 +164,7 @@ def mock_bad_aiter_bytes(chunk_size=8192):
 async def test_async_file_client_methods_validation_error(client, method, params):
     client_method = getattr(client.files, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError, match=error_msg):
+        with pytest.raises(ValidationError, match=error_msg):
             client_method(*param_values)
 
 

tests/unit/aio/test_query_client.py

@@ -4,6 +4,7 @@
 from unittest.mock import AsyncMock, Mock
 
 import pytest
+from pydantic.v1 import ValidationError
 
 from pyatlan.client.aio.query import AsyncQueryClient
 from pyatlan.client.common import AsyncApiCaller
@@ -71,16 +72,13 @@ def test_init_when_wrong_class_raises_exception(test_api_caller):
 
 @pytest.mark.parametrize(
     "test_request, error_msg",
-    [
-        [None, "none is not an allowed value"],
-        ["123", "value is not a valid dict"],
-    ],
+    [[None, "none is not an allowed value"], ["123", "value is not a valid dict"]],
 )
 def test_query_stream_wrong_params_raises_validation_error(
     test_request, error_msg, mock_async_api_caller
 ):
     client = AsyncQueryClient(client=mock_async_api_caller)
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         client.stream(request=test_request)
     assert error_msg in str(err.value)
 

tests/unit/aio/test_sso_client.py

@@ -7,7 +7,7 @@
 from unittest.mock import AsyncMock, Mock
 
 import pytest
-from pydantic.v1 import parse_obj_as
+from pydantic.v1 import ValidationError, parse_obj_as
 
 from pyatlan.client.aio.sso import AsyncSSOClient
 from pyatlan.client.common import AsyncApiCaller
@@ -86,7 +86,7 @@ def test_init_when_wrong_class_raises_exception(test_api_caller):
 def test_sso_get_group_mapping_wrong_params_raises_validation_error(
     sso_alias, group_map_id, error_msg
 ):
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         AsyncSSOClient.get_group_mapping(sso_alias=sso_alias, group_map_id=group_map_id)
     assert error_msg in str(err.value)
 
@@ -101,7 +101,7 @@ def test_sso_get_group_mapping_wrong_params_raises_validation_error(
 def test_sso_get_all_group_mapping_wrong_params_raises_validation_error(
     sso_alias, error_msg
 ):
-    with pytest.raises(ValueError, match=error_msg):
+    with pytest.raises(ValidationError, match=error_msg):
         AsyncSSOClient.get_all_group_mappings(sso_alias=sso_alias)
 
 
@@ -119,7 +119,7 @@ def test_sso_get_all_group_mapping_wrong_params_raises_validation_error(
 def test_sso_create_group_mapping_wrong_params_raises_validation_error(
     sso_alias, atlan_group, sso_group_name, error_msg
 ):
-    with pytest.raises(ValueError, match=error_msg):
+    with pytest.raises(ValidationError, match=error_msg):
         AsyncSSOClient.create_group_mapping(
             sso_alias=sso_alias, atlan_group=atlan_group, sso_group_name=sso_group_name
         )
@@ -160,7 +160,7 @@ def test_sso_create_group_mapping_wrong_params_raises_validation_error(
 def test_sso_update_group_mapping_wrong_params_raises_validation_error(
     sso_alias, atlan_group, group_map_id, sso_group_name, error_msg
 ):
-    with pytest.raises(ValueError, match=error_msg):
+    with pytest.raises(ValidationError, match=error_msg):
         AsyncSSOClient.update_group_mapping(
             sso_alias=sso_alias,
             atlan_group=atlan_group,
@@ -181,7 +181,7 @@ def test_sso_update_group_mapping_wrong_params_raises_validation_error(
 def test_sso_delete_group_mapping_wrong_params_raises_validation_error(
     sso_alias, group_map_id, error_msg
 ):
-    with pytest.raises(ValueError, match=error_msg):
+    with pytest.raises(ValidationError, match=error_msg):
         AsyncSSOClient.delete_group_mapping(
             sso_alias=sso_alias, group_map_id=group_map_id
         )

tests/unit/aio/test_task_client.py

@@ -5,6 +5,7 @@
 from unittest.mock import AsyncMock, Mock
 
 import pytest
+from pydantic.v1 import ValidationError
 
 from pyatlan.client.aio.task import AsyncTaskClient
 from pyatlan.client.common import AsyncApiCaller
@@ -74,16 +75,13 @@ def test_init_when_wrong_class_raises_exception(test_api_caller):
 
 @pytest.mark.parametrize(
     "test_request, error_msg",
-    [
-        [None, "none is not an allowed value"],
-        ["123", "value is not a valid dict"],
-    ],
+    [[None, "none is not an allowed value"], ["123", "value is not a valid dict"]],
 )
 def test_task_search_wrong_params_raises_validation_error(
     test_request, error_msg, mock_async_api_caller
 ):
     client = AsyncTaskClient(client=mock_async_api_caller)
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValidationError) as err:
         client.search(request=test_request)
     assert error_msg in str(err.value)
 

tests/unit/aio/test_workflow_client.py

@@ -3,6 +3,7 @@
 from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
+from pydantic.v1 import ValidationError
 
 from pyatlan.client.aio.client import AsyncAtlanClient
 from pyatlan.client.aio.workflow import AsyncWorkflowClient
@@ -176,7 +177,7 @@ def update_response() -> WorkflowResponse:
 async def test_async_workflow_client_methods_validation_error(method, params):
     client_method = getattr(AsyncAtlanClient().workflow, method)
     for param_values, error_msg in params:
-        with pytest.raises(ValueError, match=error_msg):
+        with pytest.raises(ValidationError, match=error_msg):
             await client_method(*param_values)