diff --git a/changelog.d/20250710_115829_max.tuecke_sc_26339_rename_testing.rst b/changelog.d/20250710_115829_max.tuecke_sc_26339_rename_testing.rst new file mode 100644 index 000000000..63d4be747 --- /dev/null +++ b/changelog.d/20250710_115829_max.tuecke_sc_26339_rename_testing.rst @@ -0,0 +1,4 @@ +Changed +------- + +- Renamed the ``globus_sdk._testing`` subpackage to ``globus_sdk.testing``. (:pr:`1251`) diff --git a/docs/testing/getting_started.rst b/docs/testing/getting_started.rst index 8ace2283f..d274f4d5c 100644 --- a/docs/testing/getting_started.rst +++ b/docs/testing/getting_started.rst @@ -3,15 +3,15 @@ This component is an *alpha*. Interfaces may change outside of the normal semver policy. -Getting Started with _testing -============================= +Getting Started with testing +============================ Dependencies ------------ This toolchain requires the ``responses`` library. -``globus_sdk._testing`` is tested to operate with the latest version of +``globus_sdk.testing`` is tested to operate with the latest version of ``responses``. Recommended Fixtures @@ -41,7 +41,7 @@ activated by name: .. code-block:: python - from globus_sdk._testing import load_response + from globus_sdk.testing import load_response # load_response will add the response to `responses` and return it load_response("auth.get_identities") @@ -54,7 +54,7 @@ unbound, as in: .. code-block:: python import globus_sdk - from globus_sdk._testing import load_response + from globus_sdk.testing import load_response load_response(globus_sdk.AuthClient.get_identities) load_response(globus_sdk.AuthClient.get_identities, case="unauthorized") @@ -71,7 +71,7 @@ load all of them at once: .. code-block:: python - from globus_sdk._testing import load_response_set + from globus_sdk.testing import load_response_set fixtures = load_response_set("scenario.foo") @@ -86,7 +86,7 @@ response is ``"default"``. .. code-block:: python from globus_sdk import AuthClient - from globus_sdk._testing import get_response_set + from globus_sdk.testing import get_response_set # rset will not be activated rset = get_response_set(AuthClient.get_identities) @@ -110,7 +110,7 @@ override the builtin response sets, if names match. .. code-block:: python - from globus_sdk._testing import load_response_set, register_response_set + from globus_sdk.testing import load_response_set, register_response_set import uuid # register a scenario under which Globus Auth get_identities and Globus @@ -152,7 +152,7 @@ Loading Responses without Registering Because ``RegisteredResponse`` takes care of resolving ``"auth"`` to the Auth URL, ``"transfer"`` to the Transfer URL, and so forth, you might want to use -``globus_sdk._testing`` in lieu of ``responses`` even when registering single +``globus_sdk.testing`` in lieu of ``responses`` even when registering single responses for individual tests. To support this mode of usage, ``load_response`` can take a @@ -165,7 +165,7 @@ Consider the following example of a parametrized test which uses .. code-block:: python - from globus_sdk._testing import load_response, RegisteredResponse + from globus_sdk.testing import load_response, RegisteredResponse import pytest @@ -191,7 +191,7 @@ outside of the specific test. Using non-default responses.RequestsMock objects ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -By default, all methods in ``globus_sdk._testing`` which converse with +By default, all methods in ``globus_sdk.testing`` which converse with ``responses`` use the default mock. This is the behavior offered by ``responses.add(...)`` and similar methods. @@ -208,7 +208,7 @@ e.g. .. code-block:: python - from globus_sdk._testing import get_last_request + from globus_sdk.testing import get_last_request import responses custom_mock = responses.RequestsMock(...) diff --git a/docs/testing/index.rst b/docs/testing/index.rst index 9de0abb21..47d97fb40 100644 --- a/docs/testing/index.rst +++ b/docs/testing/index.rst @@ -3,14 +3,14 @@ This component is an *alpha*. Interfaces may change outside of the normal semver policy. -.. _testing_root: +.. testing_root: -Globus SDK _testing -=================== +Globus SDK testing +================== .. warning:: - The exact data and payloads provided via ``_testing`` are a best + The exact data and payloads provided via ``testing`` are a best approximation of API responses. They may change in any SDK release to be more accurate. diff --git a/docs/testing/methods/auth.rst b/docs/testing/methods/auth.rst index 538af2410..0c43fb93b 100644 --- a/docs/testing/methods/auth.rst +++ b/docs/testing/methods/auth.rst @@ -1,4 +1,4 @@ -Globus Auth _testing Method List -================================ +Globus Auth testing Method List +=============================== .. enumeratetestingfixtures:: globus_sdk.AuthClient diff --git a/docs/testing/methods/flows.rst b/docs/testing/methods/flows.rst index 65d6587b9..38401ba9e 100644 --- a/docs/testing/methods/flows.rst +++ b/docs/testing/methods/flows.rst @@ -1,5 +1,5 @@ -Globus Flows _testing Method List -================================= +Globus Flows testing Method List +================================ .. enumeratetestingfixtures:: globus_sdk.FlowsClient diff --git a/docs/testing/methods/gcs.rst b/docs/testing/methods/gcs.rst index f9f32bc92..dbdb157ed 100644 --- a/docs/testing/methods/gcs.rst +++ b/docs/testing/methods/gcs.rst @@ -1,4 +1,4 @@ -Globus Connect Server _testing Method List -========================================== +Globus Connect Server testing Method List +========================================= .. enumeratetestingfixtures:: globus_sdk.GCSClient diff --git a/docs/testing/methods/groups.rst b/docs/testing/methods/groups.rst index cf0885ef8..f60978d55 100644 --- a/docs/testing/methods/groups.rst +++ b/docs/testing/methods/groups.rst @@ -1,4 +1,4 @@ -Globus Groups _testing Method List -================================== +Globus Groups testing Method List +================================= .. enumeratetestingfixtures:: globus_sdk.GroupsClient diff --git a/docs/testing/methods/index.rst b/docs/testing/methods/index.rst index a47b86348..33dff9633 100644 --- a/docs/testing/methods/index.rst +++ b/docs/testing/methods/index.rst @@ -3,10 +3,10 @@ This component is an *alpha*. Interfaces may change outside of the normal semver policy. -_testing Method List -==================== +testing Method List +=================== -These pages list all methods which have ``globus_sdk._testing`` response data, +These pages list all methods which have ``globus_sdk.testing`` response data, and the casenames for those data. .. toctree:: diff --git a/docs/testing/methods/search.rst b/docs/testing/methods/search.rst index effa27c3a..be09ad003 100644 --- a/docs/testing/methods/search.rst +++ b/docs/testing/methods/search.rst @@ -1,4 +1,4 @@ -Globus Search _testing Method List -================================== +Globus Search testing Method List +================================= .. enumeratetestingfixtures:: globus_sdk.SearchClient diff --git a/docs/testing/methods/timers.rst b/docs/testing/methods/timers.rst index 638982725..301376fed 100644 --- a/docs/testing/methods/timers.rst +++ b/docs/testing/methods/timers.rst @@ -1,4 +1,4 @@ -Globus Timers _testing Method List -================================== +Globus Timers testing Method List +================================= .. enumeratetestingfixtures:: globus_sdk.TimersClient diff --git a/docs/testing/methods/transfer.rst b/docs/testing/methods/transfer.rst index d6b71a2e5..8b52f6976 100644 --- a/docs/testing/methods/transfer.rst +++ b/docs/testing/methods/transfer.rst @@ -1,4 +1,4 @@ -Globus Transfer _testing Method List -==================================== +Globus Transfer testing Method List +=================================== .. enumeratetestingfixtures:: globus_sdk.TransferClient diff --git a/docs/testing/reference.rst b/docs/testing/reference.rst index 51a5f9d1a..490935add 100644 --- a/docs/testing/reference.rst +++ b/docs/testing/reference.rst @@ -3,10 +3,10 @@ This component is an *alpha*. Interfaces may change outside of the normal semver policy. -_testing Reference -================== +testing Reference +================= -.. module:: globus_sdk._testing +.. module:: globus_sdk.testing Functions --------- diff --git a/pyproject.toml b/pyproject.toml index 93ae978d4..e093dc324 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,7 +79,7 @@ typing = [ "types-requests", "typing-extensions>=4.0", # although 'responses' is provided by the test requirements, it also - # must be installed for proper type-checking on globus_sdk._testing + # must be installed for proper type-checking on globus_sdk.testing "responses", # similarly, sphinx is needed to type-check our sphinx extension "sphinx", @@ -120,7 +120,7 @@ source = ["globus_sdk"] # omit must be specified in a way which matches the # tox environment installations, so lead with `**` omit = [ - "**/globus_sdk/_testing/*", + "**/globus_sdk/testing/*", ] [tool.coverage.paths] diff --git a/scripts/ensure_exports_are_documented.py b/scripts/ensure_exports_are_documented.py index f871211c3..917e2ad4f 100755 --- a/scripts/ensure_exports_are_documented.py +++ b/scripts/ensure_exports_are_documented.py @@ -20,7 +20,7 @@ "globus_sdk/globus_app/", "globus_sdk/scopes/", "globus_sdk/response.py", - "globus_sdk/_testing/", + "globus_sdk/testing/", ) DEPRECATED_NAMES = { diff --git a/src/globus_sdk/_sphinxext/directives/enumerate_testing_fixtures.py b/src/globus_sdk/_sphinxext/directives/enumerate_testing_fixtures.py index f6194a555..9734bee9e 100644 --- a/src/globus_sdk/_sphinxext/directives/enumerate_testing_fixtures.py +++ b/src/globus_sdk/_sphinxext/directives/enumerate_testing_fixtures.py @@ -17,7 +17,7 @@ class EnumerateTestingFixtures(AddContentDirective): } def gen_rst(self) -> t.Iterator[str]: - from globus_sdk._testing import get_response_set + from globus_sdk.testing import get_response_set underline_char = self.options.get("header_underline_char", "-") @@ -46,7 +46,7 @@ def gen_rst(self) -> t.Iterator[str]: for casename in rset.cases(): # use "attr" rather than "meth" so that sphinx does not add parens # the use of the method as an attribute of the class or instance better - # matches how `_testing` handles things + # matches how `testing` handles things yield ( ".. dropdown:: " f':py:attr:`~{classname}.{methodname}` (``case="{casename}"``)' diff --git a/src/globus_sdk/_sphinxext/directives/expand_testing_fixture.py b/src/globus_sdk/_sphinxext/directives/expand_testing_fixture.py index f41450db5..0bcf109cc 100644 --- a/src/globus_sdk/_sphinxext/directives/expand_testing_fixture.py +++ b/src/globus_sdk/_sphinxext/directives/expand_testing_fixture.py @@ -3,7 +3,7 @@ from docutils.parsers.rst import directives -from globus_sdk._testing import ResponseList +from globus_sdk.testing import ResponseList from .add_content_directive import AddContentDirective @@ -17,7 +17,7 @@ class ExpandTestingFixture(AddContentDirective): } def gen_rst(self) -> t.Iterator[str]: - from globus_sdk._testing import get_response_set + from globus_sdk.testing import get_response_set response_set_name = self.arguments[0] casename = "default" diff --git a/src/globus_sdk/_testing/__init__.py b/src/globus_sdk/testing/__init__.py similarity index 100% rename from src/globus_sdk/_testing/__init__.py rename to src/globus_sdk/testing/__init__.py diff --git a/src/globus_sdk/_testing/data/__init__.py b/src/globus_sdk/testing/data/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/__init__.py rename to src/globus_sdk/testing/data/__init__.py diff --git a/src/globus_sdk/_testing/data/auth/__init__.py b/src/globus_sdk/testing/data/auth/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/auth/__init__.py rename to src/globus_sdk/testing/data/auth/__init__.py diff --git a/src/globus_sdk/_testing/data/auth/_common.py b/src/globus_sdk/testing/data/auth/_common.py similarity index 100% rename from src/globus_sdk/_testing/data/auth/_common.py rename to src/globus_sdk/testing/data/auth/_common.py diff --git a/src/globus_sdk/_testing/data/auth/create_child_client.py b/src/globus_sdk/testing/data/auth/create_child_client.py similarity index 98% rename from src/globus_sdk/_testing/data/auth/create_child_client.py rename to src/globus_sdk/testing/data/auth/create_child_client.py index 8a38df251..e3f89d124 100644 --- a/src/globus_sdk/_testing/data/auth/create_child_client.py +++ b/src/globus_sdk/testing/data/auth/create_child_client.py @@ -3,7 +3,7 @@ from responses.matchers import json_params_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet _COMMON_RESPONSE_RECORD = { "fqdns": [], diff --git a/src/globus_sdk/_testing/data/auth/create_client.py b/src/globus_sdk/testing/data/auth/create_client.py similarity index 98% rename from src/globus_sdk/_testing/data/auth/create_client.py rename to src/globus_sdk/testing/data/auth/create_client.py index 64274c70d..fcdd4e9ce 100644 --- a/src/globus_sdk/_testing/data/auth/create_client.py +++ b/src/globus_sdk/testing/data/auth/create_client.py @@ -3,7 +3,7 @@ from responses.matchers import json_params_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet _COMMON_RESPONSE_RECORD = { "fqdns": [], diff --git a/src/globus_sdk/_testing/data/auth/create_client_credential.py b/src/globus_sdk/testing/data/auth/create_client_credential.py similarity index 93% rename from src/globus_sdk/_testing/data/auth/create_client_credential.py rename to src/globus_sdk/testing/data/auth/create_client_credential.py index 19f43fd5b..29ff4344d 100644 --- a/src/globus_sdk/_testing/data/auth/create_client_credential.py +++ b/src/globus_sdk/testing/data/auth/create_client_credential.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet NEW_CREDENTIAL_NAME = str(uuid.uuid4()).replace("-", "") diff --git a/src/globus_sdk/_testing/data/auth/create_native_app_instance.py b/src/globus_sdk/testing/data/auth/create_native_app_instance.py similarity index 97% rename from src/globus_sdk/_testing/data/auth/create_native_app_instance.py rename to src/globus_sdk/testing/data/auth/create_native_app_instance.py index cc9637ac2..d50a31d5c 100644 --- a/src/globus_sdk/_testing/data/auth/create_native_app_instance.py +++ b/src/globus_sdk/testing/data/auth/create_native_app_instance.py @@ -3,7 +3,7 @@ from responses.matchers import json_params_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet APP_REQUEST_ARGS = { "template_id": str(uuid.uuid1()), diff --git a/src/globus_sdk/_testing/data/auth/create_policy.py b/src/globus_sdk/testing/data/auth/create_policy.py similarity index 98% rename from src/globus_sdk/_testing/data/auth/create_policy.py rename to src/globus_sdk/testing/data/auth/create_policy.py index c1934ecf1..a97fe5d1c 100644 --- a/src/globus_sdk/_testing/data/auth/create_policy.py +++ b/src/globus_sdk/testing/data/auth/create_policy.py @@ -3,7 +3,7 @@ from responses.matchers import json_params_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet POLICY_REQUEST_ARGS = { "project_id": str(uuid.uuid1()), diff --git a/src/globus_sdk/_testing/data/auth/create_project.py b/src/globus_sdk/testing/data/auth/create_project.py similarity index 96% rename from src/globus_sdk/_testing/data/auth/create_project.py rename to src/globus_sdk/testing/data/auth/create_project.py index 5e2a2b0f0..3d2ac5de7 100644 --- a/src/globus_sdk/_testing/data/auth/create_project.py +++ b/src/globus_sdk/testing/data/auth/create_project.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet project_id = str(uuid.uuid1()) star_lord = { diff --git a/src/globus_sdk/_testing/data/auth/create_scope.py b/src/globus_sdk/testing/data/auth/create_scope.py similarity index 98% rename from src/globus_sdk/_testing/data/auth/create_scope.py rename to src/globus_sdk/testing/data/auth/create_scope.py index 9f217709b..95ba4958d 100644 --- a/src/globus_sdk/_testing/data/auth/create_scope.py +++ b/src/globus_sdk/testing/data/auth/create_scope.py @@ -4,7 +4,7 @@ from responses.matchers import json_params_matcher from globus_sdk import DependentScopeSpec -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet SCOPE_REQUEST_ARGS = { "client_id": str(uuid.uuid1()), diff --git a/src/globus_sdk/_testing/data/auth/delete_client.py b/src/globus_sdk/testing/data/auth/delete_client.py similarity index 92% rename from src/globus_sdk/_testing/data/auth/delete_client.py rename to src/globus_sdk/testing/data/auth/delete_client.py index f5916df0a..499222aff 100644 --- a/src/globus_sdk/_testing/data/auth/delete_client.py +++ b/src/globus_sdk/testing/data/auth/delete_client.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CLIENT = { "required_idp": None, diff --git a/src/globus_sdk/_testing/data/auth/delete_client_credential.py b/src/globus_sdk/testing/data/auth/delete_client_credential.py similarity index 88% rename from src/globus_sdk/_testing/data/auth/delete_client_credential.py rename to src/globus_sdk/testing/data/auth/delete_client_credential.py index ac407af21..68a1bae7d 100644 --- a/src/globus_sdk/_testing/data/auth/delete_client_credential.py +++ b/src/globus_sdk/testing/data/auth/delete_client_credential.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CREDENTIAL = { "name": "foo", diff --git a/src/globus_sdk/_testing/data/auth/delete_policy.py b/src/globus_sdk/testing/data/auth/delete_policy.py similarity index 90% rename from src/globus_sdk/_testing/data/auth/delete_policy.py rename to src/globus_sdk/testing/data/auth/delete_policy.py index 6aa91ab50..f0924fbab 100644 --- a/src/globus_sdk/_testing/data/auth/delete_policy.py +++ b/src/globus_sdk/testing/data/auth/delete_policy.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet POLICY = { "high_assurance": False, diff --git a/src/globus_sdk/_testing/data/auth/delete_project.py b/src/globus_sdk/testing/data/auth/delete_project.py similarity index 93% rename from src/globus_sdk/_testing/data/auth/delete_project.py rename to src/globus_sdk/testing/data/auth/delete_project.py index fb152e510..12d570f11 100644 --- a/src/globus_sdk/_testing/data/auth/delete_project.py +++ b/src/globus_sdk/testing/data/auth/delete_project.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet project_id = str(uuid.uuid1()) star_lord = { diff --git a/src/globus_sdk/_testing/data/auth/delete_scope.py b/src/globus_sdk/testing/data/auth/delete_scope.py similarity index 90% rename from src/globus_sdk/_testing/data/auth/delete_scope.py rename to src/globus_sdk/testing/data/auth/delete_scope.py index 67aaee1da..f7afd4e57 100644 --- a/src/globus_sdk/_testing/data/auth/delete_scope.py +++ b/src/globus_sdk/testing/data/auth/delete_scope.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet SCOPE = { "scope_string": "https://auth.globus.org/scopes/3f33d83f-ec0a-4190-887d-0622e7c4ee9a/manager", # noqa: E501 diff --git a/src/globus_sdk/_testing/data/auth/get_client.py b/src/globus_sdk/testing/data/auth/get_client.py similarity index 93% rename from src/globus_sdk/_testing/data/auth/get_client.py rename to src/globus_sdk/testing/data/auth/get_client.py index d422b7f06..046823d26 100644 --- a/src/globus_sdk/_testing/data/auth/get_client.py +++ b/src/globus_sdk/testing/data/auth/get_client.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet FQDN = "globus.org" diff --git a/src/globus_sdk/_testing/data/auth/get_client_credentials.py b/src/globus_sdk/testing/data/auth/get_client_credentials.py similarity index 88% rename from src/globus_sdk/_testing/data/auth/get_client_credentials.py rename to src/globus_sdk/testing/data/auth/get_client_credentials.py index a86bffb49..706018fb7 100644 --- a/src/globus_sdk/_testing/data/auth/get_client_credentials.py +++ b/src/globus_sdk/testing/data/auth/get_client_credentials.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CREDENTIAL = { "name": "foo", diff --git a/src/globus_sdk/_testing/data/auth/get_clients.py b/src/globus_sdk/testing/data/auth/get_clients.py similarity index 95% rename from src/globus_sdk/_testing/data/auth/get_clients.py rename to src/globus_sdk/testing/data/auth/get_clients.py index 8599015ab..746217e49 100644 --- a/src/globus_sdk/_testing/data/auth/get_clients.py +++ b/src/globus_sdk/testing/data/auth/get_clients.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet FOO_CLIENT = { "required_idp": None, diff --git a/src/globus_sdk/_testing/data/auth/get_consents.py b/src/globus_sdk/testing/data/auth/get_consents.py similarity index 96% rename from src/globus_sdk/_testing/data/auth/get_consents.py rename to src/globus_sdk/testing/data/auth/get_consents.py index 3270cb528..1068f8f5d 100644 --- a/src/globus_sdk/_testing/data/auth/get_consents.py +++ b/src/globus_sdk/testing/data/auth/get_consents.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet _DATA_ACCESS = ( "https://auth.globus.org/scopes/542a86fc-1766-450d-841f-065488a2ec01/data_access" diff --git a/src/globus_sdk/_testing/data/auth/get_identities.py b/src/globus_sdk/testing/data/auth/get_identities.py similarity index 97% rename from src/globus_sdk/_testing/data/auth/get_identities.py rename to src/globus_sdk/testing/data/auth/get_identities.py index f7b530882..1c281f790 100644 --- a/src/globus_sdk/_testing/data/auth/get_identities.py +++ b/src/globus_sdk/testing/data/auth/get_identities.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import UNAUTHORIZED_AUTH_RESPONSE diff --git a/src/globus_sdk/_testing/data/auth/get_identity_providers.py b/src/globus_sdk/testing/data/auth/get_identity_providers.py similarity index 94% rename from src/globus_sdk/_testing/data/auth/get_identity_providers.py rename to src/globus_sdk/testing/data/auth/get_identity_providers.py index 7e632f7c0..82043b12b 100644 --- a/src/globus_sdk/_testing/data/auth/get_identity_providers.py +++ b/src/globus_sdk/testing/data/auth/get_identity_providers.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet globusid_idp = { "short_name": "globusid", diff --git a/src/globus_sdk/_testing/data/auth/get_policies.py b/src/globus_sdk/testing/data/auth/get_policies.py similarity index 94% rename from src/globus_sdk/_testing/data/auth/get_policies.py rename to src/globus_sdk/testing/data/auth/get_policies.py index 086d2ce55..25d76bb27 100644 --- a/src/globus_sdk/_testing/data/auth/get_policies.py +++ b/src/globus_sdk/testing/data/auth/get_policies.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet GREEN_LIGHT_POLICY = { "high_assurance": False, diff --git a/src/globus_sdk/_testing/data/auth/get_policy.py b/src/globus_sdk/testing/data/auth/get_policy.py similarity index 90% rename from src/globus_sdk/_testing/data/auth/get_policy.py rename to src/globus_sdk/testing/data/auth/get_policy.py index 916da351a..ab36fa5d2 100644 --- a/src/globus_sdk/_testing/data/auth/get_policy.py +++ b/src/globus_sdk/testing/data/auth/get_policy.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet POLICY = { "high_assurance": False, diff --git a/src/globus_sdk/_testing/data/auth/get_project.py b/src/globus_sdk/testing/data/auth/get_project.py similarity index 95% rename from src/globus_sdk/_testing/data/auth/get_project.py rename to src/globus_sdk/testing/data/auth/get_project.py index 0306d9baa..2471df49a 100644 --- a/src/globus_sdk/_testing/data/auth/get_project.py +++ b/src/globus_sdk/testing/data/auth/get_project.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet GUARDIANS_IDP_ID = str(uuid.uuid1()) STAR_LORD = { diff --git a/src/globus_sdk/_testing/data/auth/get_projects.py b/src/globus_sdk/testing/data/auth/get_projects.py similarity index 96% rename from src/globus_sdk/_testing/data/auth/get_projects.py rename to src/globus_sdk/testing/data/auth/get_projects.py index a81f65d5a..1d2f8907b 100644 --- a/src/globus_sdk/_testing/data/auth/get_projects.py +++ b/src/globus_sdk/testing/data/auth/get_projects.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet GUARDIANS_IDP_ID = str(uuid.uuid1()) STAR_LORD = { diff --git a/src/globus_sdk/_testing/data/auth/get_scope.py b/src/globus_sdk/testing/data/auth/get_scope.py similarity index 90% rename from src/globus_sdk/_testing/data/auth/get_scope.py rename to src/globus_sdk/testing/data/auth/get_scope.py index e7bd40b2b..a40d13945 100644 --- a/src/globus_sdk/_testing/data/auth/get_scope.py +++ b/src/globus_sdk/testing/data/auth/get_scope.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet SCOPE = { "scope_string": "https://auth.globus.org/scopes/3f33d83f-ec0a-4190-887d-0622e7c4ee9a/manager", # noqa: E501 diff --git a/src/globus_sdk/_testing/data/auth/get_scopes.py b/src/globus_sdk/testing/data/auth/get_scopes.py similarity index 95% rename from src/globus_sdk/_testing/data/auth/get_scopes.py rename to src/globus_sdk/testing/data/auth/get_scopes.py index 0b4e195a8..d8c0431e0 100644 --- a/src/globus_sdk/_testing/data/auth/get_scopes.py +++ b/src/globus_sdk/testing/data/auth/get_scopes.py @@ -2,7 +2,7 @@ from responses.matchers import query_param_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet SCOPE1 = { "scope_string": "https://auth.globus.org/scopes/3f33d83f-ec0a-4190-887d-0622e7c4ee9a/manage", # noqa: E501 diff --git a/src/globus_sdk/_testing/data/auth/oauth2_client_credentials_tokens.py b/src/globus_sdk/testing/data/auth/oauth2_client_credentials_tokens.py similarity index 94% rename from src/globus_sdk/_testing/data/auth/oauth2_client_credentials_tokens.py rename to src/globus_sdk/testing/data/auth/oauth2_client_credentials_tokens.py index be0f416ab..e0d046d38 100644 --- a/src/globus_sdk/_testing/data/auth/oauth2_client_credentials_tokens.py +++ b/src/globus_sdk/testing/data/auth/oauth2_client_credentials_tokens.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet _token = "DUMMY_TRANSFER_TOKEN_FROM_THE_INTERTUBES" _scope = "urn:globus:auth:scope:transfer.api.globus.org:all" diff --git a/src/globus_sdk/_testing/data/auth/oauth2_exchange_code_for_tokens.py b/src/globus_sdk/testing/data/auth/oauth2_exchange_code_for_tokens.py similarity index 94% rename from src/globus_sdk/_testing/data/auth/oauth2_exchange_code_for_tokens.py rename to src/globus_sdk/testing/data/auth/oauth2_exchange_code_for_tokens.py index e691e087f..e7b8bbce6 100644 --- a/src/globus_sdk/_testing/data/auth/oauth2_exchange_code_for_tokens.py +++ b/src/globus_sdk/testing/data/auth/oauth2_exchange_code_for_tokens.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet RESPONSES = ResponseSet( default=RegisteredResponse( diff --git a/src/globus_sdk/_testing/data/auth/oauth2_get_dependent_tokens.py b/src/globus_sdk/testing/data/auth/oauth2_get_dependent_tokens.py similarity index 96% rename from src/globus_sdk/_testing/data/auth/oauth2_get_dependent_tokens.py rename to src/globus_sdk/testing/data/auth/oauth2_get_dependent_tokens.py index b9c06d250..994d36741 100644 --- a/src/globus_sdk/_testing/data/auth/oauth2_get_dependent_tokens.py +++ b/src/globus_sdk/testing/data/auth/oauth2_get_dependent_tokens.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet RESPONSES = ResponseSet( groups=RegisteredResponse( diff --git a/src/globus_sdk/_testing/data/auth/oauth2_revoke_token.py b/src/globus_sdk/testing/data/auth/oauth2_revoke_token.py similarity index 72% rename from src/globus_sdk/_testing/data/auth/oauth2_revoke_token.py rename to src/globus_sdk/testing/data/auth/oauth2_revoke_token.py index 78005c482..f66e4439b 100644 --- a/src/globus_sdk/_testing/data/auth/oauth2_revoke_token.py +++ b/src/globus_sdk/testing/data/auth/oauth2_revoke_token.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet RESPONSES = ResponseSet( default=RegisteredResponse( diff --git a/src/globus_sdk/_testing/data/auth/oauth2_token_introspect.py b/src/globus_sdk/testing/data/auth/oauth2_token_introspect.py similarity index 94% rename from src/globus_sdk/_testing/data/auth/oauth2_token_introspect.py rename to src/globus_sdk/testing/data/auth/oauth2_token_introspect.py index e05749c59..5927b6883 100644 --- a/src/globus_sdk/_testing/data/auth/oauth2_token_introspect.py +++ b/src/globus_sdk/testing/data/auth/oauth2_token_introspect.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet _kingfish = { "username": "kingfish@globus.org", diff --git a/src/globus_sdk/_testing/data/auth/oauth2_userinfo.py b/src/globus_sdk/testing/data/auth/oauth2_userinfo.py similarity index 100% rename from src/globus_sdk/_testing/data/auth/oauth2_userinfo.py rename to src/globus_sdk/testing/data/auth/oauth2_userinfo.py diff --git a/src/globus_sdk/_testing/data/auth/update_client.py b/src/globus_sdk/testing/data/auth/update_client.py similarity index 97% rename from src/globus_sdk/_testing/data/auth/update_client.py rename to src/globus_sdk/testing/data/auth/update_client.py index c122eed1f..7fa7c203a 100644 --- a/src/globus_sdk/_testing/data/auth/update_client.py +++ b/src/globus_sdk/testing/data/auth/update_client.py @@ -3,7 +3,7 @@ from responses.matchers import json_params_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet _COMMON_RESPONSE_RECORD = { "fqdns": [], diff --git a/src/globus_sdk/_testing/data/auth/update_policy.py b/src/globus_sdk/testing/data/auth/update_policy.py similarity index 98% rename from src/globus_sdk/_testing/data/auth/update_policy.py rename to src/globus_sdk/testing/data/auth/update_policy.py index 83925d73d..e198383be 100644 --- a/src/globus_sdk/_testing/data/auth/update_policy.py +++ b/src/globus_sdk/testing/data/auth/update_policy.py @@ -3,7 +3,7 @@ from responses.matchers import json_params_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet POLICY_REQUEST_ARGS = { "policy_id": str(uuid.uuid1()), diff --git a/src/globus_sdk/_testing/data/auth/update_project.py b/src/globus_sdk/testing/data/auth/update_project.py similarity index 96% rename from src/globus_sdk/_testing/data/auth/update_project.py rename to src/globus_sdk/testing/data/auth/update_project.py index c32959a30..67a3f5cff 100644 --- a/src/globus_sdk/_testing/data/auth/update_project.py +++ b/src/globus_sdk/testing/data/auth/update_project.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet project_id = str(uuid.uuid1()) star_lord = { diff --git a/src/globus_sdk/_testing/data/auth/update_scope.py b/src/globus_sdk/testing/data/auth/update_scope.py similarity index 98% rename from src/globus_sdk/_testing/data/auth/update_scope.py rename to src/globus_sdk/testing/data/auth/update_scope.py index 3d5555013..4bb62ea49 100644 --- a/src/globus_sdk/_testing/data/auth/update_scope.py +++ b/src/globus_sdk/testing/data/auth/update_scope.py @@ -4,7 +4,7 @@ from responses.matchers import json_params_matcher from globus_sdk import DependentScopeSpec -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet SCOPE_REQUEST_ARGS = { "scope_id": str(uuid.uuid1()), diff --git a/src/globus_sdk/_testing/data/auth/userinfo.py b/src/globus_sdk/testing/data/auth/userinfo.py similarity index 91% rename from src/globus_sdk/_testing/data/auth/userinfo.py rename to src/globus_sdk/testing/data/auth/userinfo.py index 2a72fb918..fe3f6adc8 100644 --- a/src/globus_sdk/_testing/data/auth/userinfo.py +++ b/src/globus_sdk/testing/data/auth/userinfo.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import FORBIDDEN_AUTH_RESPONSE, UNAUTHORIZED_AUTH_RESPONSE diff --git a/src/globus_sdk/_testing/data/compute/__init__.py b/src/globus_sdk/testing/data/compute/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/compute/__init__.py rename to src/globus_sdk/testing/data/compute/__init__.py diff --git a/src/globus_sdk/_testing/data/compute/_common.py b/src/globus_sdk/testing/data/compute/_common.py similarity index 100% rename from src/globus_sdk/_testing/data/compute/_common.py rename to src/globus_sdk/testing/data/compute/_common.py diff --git a/src/globus_sdk/_testing/data/compute/v2/__init__.py b/src/globus_sdk/testing/data/compute/v2/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/compute/v2/__init__.py rename to src/globus_sdk/testing/data/compute/v2/__init__.py diff --git a/src/globus_sdk/_testing/data/compute/v2/delete_endpoint.py b/src/globus_sdk/testing/data/compute/v2/delete_endpoint.py similarity index 79% rename from src/globus_sdk/_testing/data/compute/v2/delete_endpoint.py rename to src/globus_sdk/testing/data/compute/v2/delete_endpoint.py index e297ebc1d..fda19b179 100644 --- a/src/globus_sdk/_testing/data/compute/v2/delete_endpoint.py +++ b/src/globus_sdk/testing/data/compute/v2/delete_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/delete_function.py b/src/globus_sdk/testing/data/compute/v2/delete_function.py similarity index 79% rename from src/globus_sdk/_testing/data/compute/v2/delete_function.py rename to src/globus_sdk/testing/data/compute/v2/delete_function.py index 92a65c4b4..ef327c0f5 100644 --- a/src/globus_sdk/_testing/data/compute/v2/delete_function.py +++ b/src/globus_sdk/testing/data/compute/v2/delete_function.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import FUNCTION_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/get_endpoint.py b/src/globus_sdk/testing/data/compute/v2/get_endpoint.py similarity index 92% rename from src/globus_sdk/_testing/data/compute/v2/get_endpoint.py rename to src/globus_sdk/testing/data/compute/v2/get_endpoint.py index 8895fb25d..938224bc7 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_endpoint.py +++ b/src/globus_sdk/testing/data/compute/v2/get_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID, SUBSCRIPTION_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/get_endpoint_status.py b/src/globus_sdk/testing/data/compute/v2/get_endpoint_status.py similarity index 87% rename from src/globus_sdk/_testing/data/compute/v2/get_endpoint_status.py rename to src/globus_sdk/testing/data/compute/v2/get_endpoint_status.py index 551b32d83..2307e1af8 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_endpoint_status.py +++ b/src/globus_sdk/testing/data/compute/v2/get_endpoint_status.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/get_endpoints.py b/src/globus_sdk/testing/data/compute/v2/get_endpoints.py similarity index 95% rename from src/globus_sdk/_testing/data/compute/v2/get_endpoints.py rename to src/globus_sdk/testing/data/compute/v2/get_endpoints.py index 16c3f622a..cbf934a5b 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_endpoints.py +++ b/src/globus_sdk/testing/data/compute/v2/get_endpoints.py @@ -1,6 +1,6 @@ from responses.matchers import query_param_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID, ENDPOINT_ID_2, ENDPOINT_ID_3, NON_USER_ID, USER_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/get_function.py b/src/globus_sdk/testing/data/compute/v2/get_function.py similarity index 89% rename from src/globus_sdk/_testing/data/compute/v2/get_function.py rename to src/globus_sdk/testing/data/compute/v2/get_function.py index 21339526e..c55bda46c 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_function.py +++ b/src/globus_sdk/testing/data/compute/v2/get_function.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import FUNCTION_CODE, FUNCTION_ID, FUNCTION_NAME diff --git a/src/globus_sdk/_testing/data/compute/v2/get_result_amqp_url.py b/src/globus_sdk/testing/data/compute/v2/get_result_amqp_url.py similarity index 81% rename from src/globus_sdk/_testing/data/compute/v2/get_result_amqp_url.py rename to src/globus_sdk/testing/data/compute/v2/get_result_amqp_url.py index db8cafaa0..9e4734d40 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_result_amqp_url.py +++ b/src/globus_sdk/testing/data/compute/v2/get_result_amqp_url.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet DEFAULT_RESPONSE_DOC = { "queue_prefix": "some_prefix", diff --git a/src/globus_sdk/_testing/data/compute/v2/get_task.py b/src/globus_sdk/testing/data/compute/v2/get_task.py similarity index 78% rename from src/globus_sdk/_testing/data/compute/v2/get_task.py rename to src/globus_sdk/testing/data/compute/v2/get_task.py index 933be971f..c877b553e 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_task.py +++ b/src/globus_sdk/testing/data/compute/v2/get_task.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import TASK_DOC, TASK_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/get_task_batch.py b/src/globus_sdk/testing/data/compute/v2/get_task_batch.py similarity index 87% rename from src/globus_sdk/_testing/data/compute/v2/get_task_batch.py rename to src/globus_sdk/testing/data/compute/v2/get_task_batch.py index 451c2e8ba..7fb485867 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_task_batch.py +++ b/src/globus_sdk/testing/data/compute/v2/get_task_batch.py @@ -1,6 +1,6 @@ from responses.matchers import json_params_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import TASK_DOC, TASK_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/get_task_group.py b/src/globus_sdk/testing/data/compute/v2/get_task_group.py similarity index 89% rename from src/globus_sdk/_testing/data/compute/v2/get_task_group.py rename to src/globus_sdk/testing/data/compute/v2/get_task_group.py index 058687cd2..90e848887 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_task_group.py +++ b/src/globus_sdk/testing/data/compute/v2/get_task_group.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import TASK_GROUP_ID, TASK_ID, TASK_ID_2 diff --git a/src/globus_sdk/_testing/data/compute/v2/get_version.py b/src/globus_sdk/testing/data/compute/v2/get_version.py similarity index 90% rename from src/globus_sdk/_testing/data/compute/v2/get_version.py rename to src/globus_sdk/testing/data/compute/v2/get_version.py index 6706de913..3906a1f08 100644 --- a/src/globus_sdk/_testing/data/compute/v2/get_version.py +++ b/src/globus_sdk/testing/data/compute/v2/get_version.py @@ -1,6 +1,6 @@ from responses.matchers import query_param_matcher -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet API_VERSION = "1.23.0" ALL_RESPONSE_DOC = { diff --git a/src/globus_sdk/_testing/data/compute/v2/lock_endpoint.py b/src/globus_sdk/testing/data/compute/v2/lock_endpoint.py similarity index 85% rename from src/globus_sdk/_testing/data/compute/v2/lock_endpoint.py rename to src/globus_sdk/testing/data/compute/v2/lock_endpoint.py index acb12e33d..b22513778 100644 --- a/src/globus_sdk/_testing/data/compute/v2/lock_endpoint.py +++ b/src/globus_sdk/testing/data/compute/v2/lock_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/register_endpoint.py b/src/globus_sdk/testing/data/compute/v2/register_endpoint.py similarity index 90% rename from src/globus_sdk/_testing/data/compute/v2/register_endpoint.py rename to src/globus_sdk/testing/data/compute/v2/register_endpoint.py index a6d73dc28..8cf66b460 100644 --- a/src/globus_sdk/_testing/data/compute/v2/register_endpoint.py +++ b/src/globus_sdk/testing/data/compute/v2/register_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/compute/v2/register_function.py b/src/globus_sdk/testing/data/compute/v2/register_function.py similarity index 84% rename from src/globus_sdk/_testing/data/compute/v2/register_function.py rename to src/globus_sdk/testing/data/compute/v2/register_function.py index b0c68bd72..875ebea07 100644 --- a/src/globus_sdk/_testing/data/compute/v2/register_function.py +++ b/src/globus_sdk/testing/data/compute/v2/register_function.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import FUNCTION_CODE, FUNCTION_ID, FUNCTION_NAME diff --git a/src/globus_sdk/_testing/data/compute/v2/submit.py b/src/globus_sdk/testing/data/compute/v2/submit.py similarity index 91% rename from src/globus_sdk/_testing/data/compute/v2/submit.py rename to src/globus_sdk/testing/data/compute/v2/submit.py index 457deb065..faf557520 100644 --- a/src/globus_sdk/_testing/data/compute/v2/submit.py +++ b/src/globus_sdk/testing/data/compute/v2/submit.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import TASK_GROUP_ID, TASK_ID, TASK_ID_2 diff --git a/src/globus_sdk/_testing/data/compute/v3/__init__.py b/src/globus_sdk/testing/data/compute/v3/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/compute/v3/__init__.py rename to src/globus_sdk/testing/data/compute/v3/__init__.py diff --git a/src/globus_sdk/_testing/data/compute/v3/get_endpoint_allowlist.py b/src/globus_sdk/testing/data/compute/v3/get_endpoint_allowlist.py similarity index 86% rename from src/globus_sdk/_testing/data/compute/v3/get_endpoint_allowlist.py rename to src/globus_sdk/testing/data/compute/v3/get_endpoint_allowlist.py index 50063d58f..05fdfca48 100644 --- a/src/globus_sdk/_testing/data/compute/v3/get_endpoint_allowlist.py +++ b/src/globus_sdk/testing/data/compute/v3/get_endpoint_allowlist.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID, FUNCTION_ID, FUNCTION_ID_2 diff --git a/src/globus_sdk/_testing/data/compute/v3/lock_endpoint.py b/src/globus_sdk/testing/data/compute/v3/lock_endpoint.py similarity index 85% rename from src/globus_sdk/_testing/data/compute/v3/lock_endpoint.py rename to src/globus_sdk/testing/data/compute/v3/lock_endpoint.py index 29a669e14..1cdc66e6d 100644 --- a/src/globus_sdk/_testing/data/compute/v3/lock_endpoint.py +++ b/src/globus_sdk/testing/data/compute/v3/lock_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/compute/v3/register_endpoint.py b/src/globus_sdk/testing/data/compute/v3/register_endpoint.py similarity index 89% rename from src/globus_sdk/_testing/data/compute/v3/register_endpoint.py rename to src/globus_sdk/testing/data/compute/v3/register_endpoint.py index 5e62f8147..f6e1acfb3 100644 --- a/src/globus_sdk/_testing/data/compute/v3/register_endpoint.py +++ b/src/globus_sdk/testing/data/compute/v3/register_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/compute/v3/register_function.py b/src/globus_sdk/testing/data/compute/v3/register_function.py similarity index 86% rename from src/globus_sdk/_testing/data/compute/v3/register_function.py rename to src/globus_sdk/testing/data/compute/v3/register_function.py index c79a4fa78..b0e323153 100644 --- a/src/globus_sdk/_testing/data/compute/v3/register_function.py +++ b/src/globus_sdk/testing/data/compute/v3/register_function.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import FUNCTION_CODE, FUNCTION_ID, FUNCTION_NAME diff --git a/src/globus_sdk/_testing/data/compute/v3/submit.py b/src/globus_sdk/testing/data/compute/v3/submit.py similarity index 91% rename from src/globus_sdk/_testing/data/compute/v3/submit.py rename to src/globus_sdk/testing/data/compute/v3/submit.py index 5402cd32d..96db426f6 100644 --- a/src/globus_sdk/_testing/data/compute/v3/submit.py +++ b/src/globus_sdk/testing/data/compute/v3/submit.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID, FUNCTION_ID, TASK_GROUP_ID, TASK_ID, TASK_ID_2 diff --git a/src/globus_sdk/_testing/data/compute/v3/update_endpoint.py b/src/globus_sdk/testing/data/compute/v3/update_endpoint.py similarity index 90% rename from src/globus_sdk/_testing/data/compute/v3/update_endpoint.py rename to src/globus_sdk/testing/data/compute/v3/update_endpoint.py index e18e1271e..cc76c1a41 100644 --- a/src/globus_sdk/_testing/data/compute/v3/update_endpoint.py +++ b/src/globus_sdk/testing/data/compute/v3/update_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from .._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/flows/__init__.py b/src/globus_sdk/testing/data/flows/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/flows/__init__.py rename to src/globus_sdk/testing/data/flows/__init__.py diff --git a/src/globus_sdk/_testing/data/flows/_common.py b/src/globus_sdk/testing/data/flows/_common.py similarity index 100% rename from src/globus_sdk/_testing/data/flows/_common.py rename to src/globus_sdk/testing/data/flows/_common.py diff --git a/src/globus_sdk/_testing/data/flows/cancel_run.py b/src/globus_sdk/testing/data/flows/cancel_run.py similarity index 91% rename from src/globus_sdk/_testing/data/flows/cancel_run.py rename to src/globus_sdk/testing/data/flows/cancel_run.py index be0b8d3f6..ea59338b6 100644 --- a/src/globus_sdk/_testing/data/flows/cancel_run.py +++ b/src/globus_sdk/testing/data/flows/cancel_run.py @@ -1,6 +1,6 @@ import copy -from globus_sdk._testing import RegisteredResponse, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_RUN diff --git a/src/globus_sdk/_testing/data/flows/create_flow.py b/src/globus_sdk/testing/data/flows/create_flow.py similarity index 96% rename from src/globus_sdk/_testing/data/flows/create_flow.py rename to src/globus_sdk/testing/data/flows/create_flow.py index 40b53c01d..40297c02d 100644 --- a/src/globus_sdk/_testing/data/flows/create_flow.py +++ b/src/globus_sdk/testing/data/flows/create_flow.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_FLOW_DOC diff --git a/src/globus_sdk/_testing/data/flows/delete_flow.py b/src/globus_sdk/testing/data/flows/delete_flow.py similarity index 95% rename from src/globus_sdk/_testing/data/flows/delete_flow.py rename to src/globus_sdk/testing/data/flows/delete_flow.py index 93f9071d3..d7d24772b 100644 --- a/src/globus_sdk/_testing/data/flows/delete_flow.py +++ b/src/globus_sdk/testing/data/flows/delete_flow.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_FLOW_DOC, TWO_HOP_TRANSFER_FLOW_ID diff --git a/src/globus_sdk/_testing/data/flows/delete_run.py b/src/globus_sdk/testing/data/flows/delete_run.py similarity index 94% rename from src/globus_sdk/_testing/data/flows/delete_run.py rename to src/globus_sdk/testing/data/flows/delete_run.py index c8d7f63b2..bce819a9f 100644 --- a/src/globus_sdk/_testing/data/flows/delete_run.py +++ b/src/globus_sdk/testing/data/flows/delete_run.py @@ -1,6 +1,6 @@ import copy -from globus_sdk._testing import RegisteredResponse, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_RUN diff --git a/src/globus_sdk/_testing/data/flows/get_flow.py b/src/globus_sdk/testing/data/flows/get_flow.py similarity index 84% rename from src/globus_sdk/_testing/data/flows/get_flow.py rename to src/globus_sdk/testing/data/flows/get_flow.py index 916a92470..a27e7276e 100644 --- a/src/globus_sdk/_testing/data/flows/get_flow.py +++ b/src/globus_sdk/testing/data/flows/get_flow.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_FLOW_DOC, TWO_HOP_TRANSFER_FLOW_ID diff --git a/src/globus_sdk/_testing/data/flows/get_run.py b/src/globus_sdk/testing/data/flows/get_run.py similarity index 92% rename from src/globus_sdk/_testing/data/flows/get_run.py rename to src/globus_sdk/testing/data/flows/get_run.py index ffe6b16b3..bb8e43216 100644 --- a/src/globus_sdk/_testing/data/flows/get_run.py +++ b/src/globus_sdk/testing/data/flows/get_run.py @@ -2,7 +2,7 @@ from responses.matchers import query_param_matcher -from globus_sdk._testing import RegisteredResponse, ResponseList, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseList, ResponseSet from ._common import FLOW_DESCRIPTION, RUN, RUN_ID diff --git a/src/globus_sdk/_testing/data/flows/get_run_definition.py b/src/globus_sdk/testing/data/flows/get_run_definition.py similarity index 86% rename from src/globus_sdk/_testing/data/flows/get_run_definition.py rename to src/globus_sdk/testing/data/flows/get_run_definition.py index 3692b8fac..78aec4424 100644 --- a/src/globus_sdk/_testing/data/flows/get_run_definition.py +++ b/src/globus_sdk/testing/data/flows/get_run_definition.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing import RegisteredResponse, ResponseList, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseList, ResponseSet from ._common import RUN_ID diff --git a/src/globus_sdk/_testing/data/flows/get_run_logs.py b/src/globus_sdk/testing/data/flows/get_run_logs.py similarity index 99% rename from src/globus_sdk/_testing/data/flows/get_run_logs.py rename to src/globus_sdk/testing/data/flows/get_run_logs.py index 0e67f3513..5fe302d3f 100644 --- a/src/globus_sdk/_testing/data/flows/get_run_logs.py +++ b/src/globus_sdk/testing/data/flows/get_run_logs.py @@ -1,6 +1,6 @@ from responses.matchers import query_param_matcher -from globus_sdk._testing import RegisteredResponse, ResponseList, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseList, ResponseSet RUN_ID = "cfdaf0a4-0931-40af-b974-b619ce69f401" OWNER_URN = "urn:globus:auth:identity:944cfbe8-60f8-474d-a634-a0c1ad543a54" diff --git a/src/globus_sdk/_testing/data/flows/list_flows.py b/src/globus_sdk/testing/data/flows/list_flows.py similarity index 98% rename from src/globus_sdk/_testing/data/flows/list_flows.py rename to src/globus_sdk/testing/data/flows/list_flows.py index b2b3caf15..97abb5a89 100644 --- a/src/globus_sdk/_testing/data/flows/list_flows.py +++ b/src/globus_sdk/testing/data/flows/list_flows.py @@ -6,7 +6,7 @@ from responses import matchers -from globus_sdk._testing.models import RegisteredResponse, ResponseList, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseList, ResponseSet from ._common import TWO_HOP_TRANSFER_FLOW_DOC, TWO_HOP_TRANSFER_FLOW_ID diff --git a/src/globus_sdk/_testing/data/flows/list_runs.py b/src/globus_sdk/testing/data/flows/list_runs.py similarity index 98% rename from src/globus_sdk/_testing/data/flows/list_runs.py rename to src/globus_sdk/testing/data/flows/list_runs.py index c967afe0c..ab060058b 100644 --- a/src/globus_sdk/_testing/data/flows/list_runs.py +++ b/src/globus_sdk/testing/data/flows/list_runs.py @@ -7,7 +7,7 @@ from responses import matchers -from globus_sdk._testing import RegisteredResponse, ResponseList, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseList, ResponseSet from ._common import RUN, RUN_ID, USER1 diff --git a/src/globus_sdk/_testing/data/flows/resume_run.py b/src/globus_sdk/testing/data/flows/resume_run.py similarity index 85% rename from src/globus_sdk/_testing/data/flows/resume_run.py rename to src/globus_sdk/testing/data/flows/resume_run.py index d06693248..5c0f11ee3 100644 --- a/src/globus_sdk/_testing/data/flows/resume_run.py +++ b/src/globus_sdk/testing/data/flows/resume_run.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import RegisteredResponse, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_RUN diff --git a/src/globus_sdk/_testing/data/flows/run_flow.py b/src/globus_sdk/testing/data/flows/run_flow.py similarity index 93% rename from src/globus_sdk/_testing/data/flows/run_flow.py rename to src/globus_sdk/testing/data/flows/run_flow.py index d3756993a..32b8fa382 100644 --- a/src/globus_sdk/_testing/data/flows/run_flow.py +++ b/src/globus_sdk/testing/data/flows/run_flow.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_FLOW_ID, TWO_HOP_TRANSFER_RUN diff --git a/src/globus_sdk/_testing/data/flows/update_flow.py b/src/globus_sdk/testing/data/flows/update_flow.py similarity index 92% rename from src/globus_sdk/_testing/data/flows/update_flow.py rename to src/globus_sdk/testing/data/flows/update_flow.py index 79e5087d3..3988b7be6 100644 --- a/src/globus_sdk/_testing/data/flows/update_flow.py +++ b/src/globus_sdk/testing/data/flows/update_flow.py @@ -1,6 +1,6 @@ from copy import deepcopy -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_FLOW_DOC, TWO_HOP_TRANSFER_FLOW_ID diff --git a/src/globus_sdk/_testing/data/flows/update_run.py b/src/globus_sdk/testing/data/flows/update_run.py similarity index 84% rename from src/globus_sdk/_testing/data/flows/update_run.py rename to src/globus_sdk/testing/data/flows/update_run.py index 716f5b807..ef69da007 100644 --- a/src/globus_sdk/_testing/data/flows/update_run.py +++ b/src/globus_sdk/testing/data/flows/update_run.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import RegisteredResponse, ResponseSet +from globus_sdk.testing import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_RUN diff --git a/src/globus_sdk/_testing/data/flows/validate_flow.py b/src/globus_sdk/testing/data/flows/validate_flow.py similarity index 97% rename from src/globus_sdk/_testing/data/flows/validate_flow.py rename to src/globus_sdk/testing/data/flows/validate_flow.py index 593533dfa..c50f9e769 100644 --- a/src/globus_sdk/_testing/data/flows/validate_flow.py +++ b/src/globus_sdk/testing/data/flows/validate_flow.py @@ -1,6 +1,6 @@ from responses import matchers -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet VALIDATE_SIMPLE_FLOW_DEFINITION = { "Comment": "Simple flow", diff --git a/src/globus_sdk/_testing/data/flows/validate_run.py b/src/globus_sdk/testing/data/flows/validate_run.py similarity index 97% rename from src/globus_sdk/_testing/data/flows/validate_run.py rename to src/globus_sdk/testing/data/flows/validate_run.py index 42e82a7ce..3a609a28c 100644 --- a/src/globus_sdk/_testing/data/flows/validate_run.py +++ b/src/globus_sdk/testing/data/flows/validate_run.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TWO_HOP_TRANSFER_FLOW_ID diff --git a/src/globus_sdk/_testing/data/globus_connect_server/__init__.py b/src/globus_sdk/testing/data/globus_connect_server/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/globus_connect_server/__init__.py rename to src/globus_sdk/testing/data/globus_connect_server/__init__.py diff --git a/src/globus_sdk/_testing/data/globus_connect_server/create_storage_gateway.py b/src/globus_sdk/testing/data/globus_connect_server/create_storage_gateway.py similarity index 96% rename from src/globus_sdk/_testing/data/globus_connect_server/create_storage_gateway.py rename to src/globus_sdk/testing/data/globus_connect_server/create_storage_gateway.py index e8df287a6..8feaa7625 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/create_storage_gateway.py +++ b/src/globus_sdk/testing/data/globus_connect_server/create_storage_gateway.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet metadata = { "id": "daa09846-eb92-11e9-b89c-9cb6d0d9fd63", diff --git a/src/globus_sdk/_testing/data/globus_connect_server/create_user_credential.py b/src/globus_sdk/testing/data/globus_connect_server/create_user_credential.py similarity index 94% rename from src/globus_sdk/_testing/data/globus_connect_server/create_user_credential.py rename to src/globus_sdk/testing/data/globus_connect_server/create_user_credential.py index cdacc1c3e..cac523b5a 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/create_user_credential.py +++ b/src/globus_sdk/testing/data/globus_connect_server/create_user_credential.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CREDENTIAL_ID = "af43d884-64a1-4414-897a-680c32374439" diff --git a/src/globus_sdk/_testing/data/globus_connect_server/delete_storage_gateway.py b/src/globus_sdk/testing/data/globus_connect_server/delete_storage_gateway.py similarity index 93% rename from src/globus_sdk/_testing/data/globus_connect_server/delete_storage_gateway.py rename to src/globus_sdk/testing/data/globus_connect_server/delete_storage_gateway.py index b1ee7ae38..62b11dc9f 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/delete_storage_gateway.py +++ b/src/globus_sdk/testing/data/globus_connect_server/delete_storage_gateway.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet metadata = { "id": "daa09846-eb92-11e9-b89c-9cb6d0d9fd63", diff --git a/src/globus_sdk/_testing/data/globus_connect_server/delete_user_credential.py b/src/globus_sdk/testing/data/globus_connect_server/delete_user_credential.py similarity index 88% rename from src/globus_sdk/_testing/data/globus_connect_server/delete_user_credential.py rename to src/globus_sdk/testing/data/globus_connect_server/delete_user_credential.py index 6a85ba8a6..4b82b5fb3 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/delete_user_credential.py +++ b/src/globus_sdk/testing/data/globus_connect_server/delete_user_credential.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CREDENTIAL_ID = "af43d884-64a1-4414-897a-680c32374439" diff --git a/src/globus_sdk/_testing/data/globus_connect_server/get_collection_list.py b/src/globus_sdk/testing/data/globus_connect_server/get_collection_list.py similarity index 97% rename from src/globus_sdk/_testing/data/globus_connect_server/get_collection_list.py rename to src/globus_sdk/testing/data/globus_connect_server/get_collection_list.py index 61dc6cf99..30fd6e651 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/get_collection_list.py +++ b/src/globus_sdk/testing/data/globus_connect_server/get_collection_list.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet identity_id = str(uuid.uuid4()) collection_ids = [str(uuid.uuid4()), str(uuid.uuid4())] diff --git a/src/globus_sdk/_testing/data/globus_connect_server/get_endpoint.py b/src/globus_sdk/testing/data/globus_connect_server/get_endpoint.py similarity index 94% rename from src/globus_sdk/_testing/data/globus_connect_server/get_endpoint.py rename to src/globus_sdk/testing/data/globus_connect_server/get_endpoint.py index 82f85e355..523fcea4d 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/get_endpoint.py +++ b/src/globus_sdk/testing/data/globus_connect_server/get_endpoint.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet endpoint_id = str(uuid.uuid4()) gcs_manager_url = RegisteredResponse._url_map["gcs"] diff --git a/src/globus_sdk/_testing/data/globus_connect_server/get_gcs_info.py b/src/globus_sdk/testing/data/globus_connect_server/get_gcs_info.py similarity index 93% rename from src/globus_sdk/_testing/data/globus_connect_server/get_gcs_info.py rename to src/globus_sdk/testing/data/globus_connect_server/get_gcs_info.py index a0d1a6022..f93d1a450 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/get_gcs_info.py +++ b/src/globus_sdk/testing/data/globus_connect_server/get_gcs_info.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet endpoint_client_id = str(uuid.uuid4()) domain_name = "abc.xyz.data.globus.org" diff --git a/src/globus_sdk/_testing/data/globus_connect_server/get_storage_gateway.py b/src/globus_sdk/testing/data/globus_connect_server/get_storage_gateway.py similarity index 95% rename from src/globus_sdk/_testing/data/globus_connect_server/get_storage_gateway.py rename to src/globus_sdk/testing/data/globus_connect_server/get_storage_gateway.py index 8374c27a7..9578e0bf5 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/get_storage_gateway.py +++ b/src/globus_sdk/testing/data/globus_connect_server/get_storage_gateway.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet metadata = { "id": "daa09846-eb92-11e9-b89c-9cb6d0d9fd63", diff --git a/src/globus_sdk/_testing/data/globus_connect_server/get_storage_gateway_list.py b/src/globus_sdk/testing/data/globus_connect_server/get_storage_gateway_list.py similarity index 97% rename from src/globus_sdk/_testing/data/globus_connect_server/get_storage_gateway_list.py rename to src/globus_sdk/testing/data/globus_connect_server/get_storage_gateway_list.py index c9c268b15..7ba16adfb 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/get_storage_gateway_list.py +++ b/src/globus_sdk/testing/data/globus_connect_server/get_storage_gateway_list.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet GATEWAY_IDS = [ "a0cbde58-0183-11ea-92bd-9cb6d0d9fd63", diff --git a/src/globus_sdk/_testing/data/globus_connect_server/get_user_credential.py b/src/globus_sdk/testing/data/globus_connect_server/get_user_credential.py similarity index 94% rename from src/globus_sdk/_testing/data/globus_connect_server/get_user_credential.py rename to src/globus_sdk/testing/data/globus_connect_server/get_user_credential.py index c13f925de..9dce5fbc4 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/get_user_credential.py +++ b/src/globus_sdk/testing/data/globus_connect_server/get_user_credential.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CREDENTIAL_ID = "af43d884-64a1-4414-897a-680c32374439" diff --git a/src/globus_sdk/_testing/data/globus_connect_server/get_user_credential_list.py b/src/globus_sdk/testing/data/globus_connect_server/get_user_credential_list.py similarity index 96% rename from src/globus_sdk/_testing/data/globus_connect_server/get_user_credential_list.py rename to src/globus_sdk/testing/data/globus_connect_server/get_user_credential_list.py index aeb594f50..cd951a913 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/get_user_credential_list.py +++ b/src/globus_sdk/testing/data/globus_connect_server/get_user_credential_list.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CREDENTIAL_IDS = [ "af43d884-64a1-4414-897a-680c32374439", diff --git a/src/globus_sdk/_testing/data/globus_connect_server/update_endpoint.py b/src/globus_sdk/testing/data/globus_connect_server/update_endpoint.py similarity index 95% rename from src/globus_sdk/_testing/data/globus_connect_server/update_endpoint.py rename to src/globus_sdk/testing/data/globus_connect_server/update_endpoint.py index 32ae0bffb..fc741130f 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/update_endpoint.py +++ b/src/globus_sdk/testing/data/globus_connect_server/update_endpoint.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet endpoint_id = str(uuid.uuid4()) gcs_manager_url = RegisteredResponse._url_map["gcs"] diff --git a/src/globus_sdk/_testing/data/globus_connect_server/update_storage_gateway.py b/src/globus_sdk/testing/data/globus_connect_server/update_storage_gateway.py similarity index 95% rename from src/globus_sdk/_testing/data/globus_connect_server/update_storage_gateway.py rename to src/globus_sdk/testing/data/globus_connect_server/update_storage_gateway.py index d43b84bf7..d6c34c3ad 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/update_storage_gateway.py +++ b/src/globus_sdk/testing/data/globus_connect_server/update_storage_gateway.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet metadata = { "id": "daa09846-eb92-11e9-b89c-9cb6d0d9fd63", diff --git a/src/globus_sdk/_testing/data/globus_connect_server/update_user_credential.py b/src/globus_sdk/testing/data/globus_connect_server/update_user_credential.py similarity index 94% rename from src/globus_sdk/_testing/data/globus_connect_server/update_user_credential.py rename to src/globus_sdk/testing/data/globus_connect_server/update_user_credential.py index f31551138..d048c86ff 100644 --- a/src/globus_sdk/_testing/data/globus_connect_server/update_user_credential.py +++ b/src/globus_sdk/testing/data/globus_connect_server/update_user_credential.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet CREDENTIAL_ID = "af43d884-64a1-4414-897a-680c32374439" diff --git a/src/globus_sdk/_testing/data/groups/__init__.py b/src/globus_sdk/testing/data/groups/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/groups/__init__.py rename to src/globus_sdk/testing/data/groups/__init__.py diff --git a/src/globus_sdk/_testing/data/groups/_common.py b/src/globus_sdk/testing/data/groups/_common.py similarity index 100% rename from src/globus_sdk/_testing/data/groups/_common.py rename to src/globus_sdk/testing/data/groups/_common.py diff --git a/src/globus_sdk/_testing/data/groups/create_group.py b/src/globus_sdk/testing/data/groups/create_group.py similarity index 78% rename from src/globus_sdk/_testing/data/groups/create_group.py rename to src/globus_sdk/testing/data/groups/create_group.py index 513ba0888..083bd4a7a 100644 --- a/src/globus_sdk/_testing/data/groups/create_group.py +++ b/src/globus_sdk/testing/data/groups/create_group.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import BASE_GROUP_DOC, GROUP_ID diff --git a/src/globus_sdk/_testing/data/groups/delete_group.py b/src/globus_sdk/testing/data/groups/delete_group.py similarity index 79% rename from src/globus_sdk/_testing/data/groups/delete_group.py rename to src/globus_sdk/testing/data/groups/delete_group.py index a055ede33..2d748cd4a 100644 --- a/src/globus_sdk/_testing/data/groups/delete_group.py +++ b/src/globus_sdk/testing/data/groups/delete_group.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import BASE_GROUP_DOC, GROUP_ID diff --git a/src/globus_sdk/_testing/data/groups/get_group.py b/src/globus_sdk/testing/data/groups/get_group.py similarity index 89% rename from src/globus_sdk/_testing/data/groups/get_group.py rename to src/globus_sdk/testing/data/groups/get_group.py index 4ff0635ee..81a747011 100644 --- a/src/globus_sdk/_testing/data/groups/get_group.py +++ b/src/globus_sdk/testing/data/groups/get_group.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ( BASE_GROUP_DOC, diff --git a/src/globus_sdk/_testing/data/groups/get_group_by_subscription_id.py b/src/globus_sdk/testing/data/groups/get_group_by_subscription_id.py similarity index 90% rename from src/globus_sdk/_testing/data/groups/get_group_by_subscription_id.py rename to src/globus_sdk/testing/data/groups/get_group_by_subscription_id.py index 53ab43215..f44e80875 100644 --- a/src/globus_sdk/_testing/data/groups/get_group_by_subscription_id.py +++ b/src/globus_sdk/testing/data/groups/get_group_by_subscription_id.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import SUBSCRIPTION_GROUP_ID, SUBSCRIPTION_ID, SUBSCRIPTION_INFO diff --git a/src/globus_sdk/_testing/data/groups/get_my_groups.py b/src/globus_sdk/testing/data/groups/get_my_groups.py similarity index 98% rename from src/globus_sdk/_testing/data/groups/get_my_groups.py rename to src/globus_sdk/testing/data/groups/get_my_groups.py index 73523d28e..670989665 100644 --- a/src/globus_sdk/_testing/data/groups/get_my_groups.py +++ b/src/globus_sdk/testing/data/groups/get_my_groups.py @@ -2,7 +2,7 @@ import typing as t -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet raw_data: list[dict[str, t.Any]] = [ { diff --git a/src/globus_sdk/_testing/data/groups/set_group_policies.py b/src/globus_sdk/testing/data/groups/set_group_policies.py similarity index 88% rename from src/globus_sdk/_testing/data/groups/set_group_policies.py rename to src/globus_sdk/testing/data/groups/set_group_policies.py index 59b8970d5..22cc78164 100644 --- a/src/globus_sdk/_testing/data/groups/set_group_policies.py +++ b/src/globus_sdk/testing/data/groups/set_group_policies.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import GROUP_ID diff --git a/src/globus_sdk/_testing/data/search/__init__.py b/src/globus_sdk/testing/data/search/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/search/__init__.py rename to src/globus_sdk/testing/data/search/__init__.py diff --git a/src/globus_sdk/_testing/data/search/batch_delete_by_subject.py b/src/globus_sdk/testing/data/search/batch_delete_by_subject.py similarity index 82% rename from src/globus_sdk/_testing/data/search/batch_delete_by_subject.py rename to src/globus_sdk/testing/data/search/batch_delete_by_subject.py index d66423d26..acdca126f 100644 --- a/src/globus_sdk/_testing/data/search/batch_delete_by_subject.py +++ b/src/globus_sdk/testing/data/search/batch_delete_by_subject.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = str(uuid.uuid1()) TASK_ID = str(uuid.uuid1()) diff --git a/src/globus_sdk/_testing/data/search/create_index.py b/src/globus_sdk/testing/data/search/create_index.py similarity index 95% rename from src/globus_sdk/_testing/data/search/create_index.py rename to src/globus_sdk/testing/data/search/create_index.py index 428677bb0..224edc8cc 100644 --- a/src/globus_sdk/_testing/data/search/create_index.py +++ b/src/globus_sdk/testing/data/search/create_index.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = str(uuid.uuid4()) diff --git a/src/globus_sdk/_testing/data/search/create_role.py b/src/globus_sdk/testing/data/search/create_role.py similarity index 92% rename from src/globus_sdk/_testing/data/search/create_role.py rename to src/globus_sdk/testing/data/search/create_role.py index 41f5dfeee..e148dd065 100644 --- a/src/globus_sdk/_testing/data/search/create_role.py +++ b/src/globus_sdk/testing/data/search/create_role.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = "60d1160b-f016-40b0-8545-99619865873d" IDENTITY_ID = "46bd0f56-e24f-11e5-a510-131bef46955c" diff --git a/src/globus_sdk/_testing/data/search/delete_index.py b/src/globus_sdk/testing/data/search/delete_index.py similarity index 92% rename from src/globus_sdk/_testing/data/search/delete_index.py rename to src/globus_sdk/testing/data/search/delete_index.py index 762fe3d53..697923837 100644 --- a/src/globus_sdk/_testing/data/search/delete_index.py +++ b/src/globus_sdk/testing/data/search/delete_index.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = str(uuid.uuid4()) diff --git a/src/globus_sdk/_testing/data/search/delete_role.py b/src/globus_sdk/testing/data/search/delete_role.py similarity index 91% rename from src/globus_sdk/_testing/data/search/delete_role.py rename to src/globus_sdk/testing/data/search/delete_role.py index 6f5832ea0..591aa7df9 100644 --- a/src/globus_sdk/_testing/data/search/delete_role.py +++ b/src/globus_sdk/testing/data/search/delete_role.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = "60d1160b-f016-40b0-8545-99619865873d" IDENTITY_ID = "46bd0f56-e24f-11e5-a510-131bef46955c" diff --git a/src/globus_sdk/_testing/data/search/get_role_list.py b/src/globus_sdk/testing/data/search/get_role_list.py similarity index 94% rename from src/globus_sdk/_testing/data/search/get_role_list.py rename to src/globus_sdk/testing/data/search/get_role_list.py index b7e12f4d8..77aa041d0 100644 --- a/src/globus_sdk/_testing/data/search/get_role_list.py +++ b/src/globus_sdk/testing/data/search/get_role_list.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = "60d1160b-f016-40b0-8545-99619865873d" IDENTITY_IDS = [ diff --git a/src/globus_sdk/_testing/data/search/index_list.py b/src/globus_sdk/testing/data/search/index_list.py similarity index 95% rename from src/globus_sdk/_testing/data/search/index_list.py rename to src/globus_sdk/testing/data/search/index_list.py index d7bc3e40c..85214582f 100644 --- a/src/globus_sdk/_testing/data/search/index_list.py +++ b/src/globus_sdk/testing/data/search/index_list.py @@ -3,7 +3,7 @@ import typing as t import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_IDS = [str(uuid.uuid1()), str(uuid.uuid1())] INDEX_ATTRIBUTES: dict[str, dict[str, t.Any]] = { diff --git a/src/globus_sdk/_testing/data/search/post_search.py b/src/globus_sdk/testing/data/search/post_search.py similarity index 92% rename from src/globus_sdk/_testing/data/search/post_search.py rename to src/globus_sdk/testing/data/search/post_search.py index 0cc56b4d5..3a5cfc9f4 100644 --- a/src/globus_sdk/_testing/data/search/post_search.py +++ b/src/globus_sdk/testing/data/search/post_search.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = "60d1160b-f016-40b0-8545-99619865873d" diff --git a/src/globus_sdk/_testing/data/search/reopen_index.py b/src/globus_sdk/testing/data/search/reopen_index.py similarity index 93% rename from src/globus_sdk/_testing/data/search/reopen_index.py rename to src/globus_sdk/testing/data/search/reopen_index.py index 069d67806..2f8069b3a 100644 --- a/src/globus_sdk/_testing/data/search/reopen_index.py +++ b/src/globus_sdk/testing/data/search/reopen_index.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = str(uuid.uuid4()) diff --git a/src/globus_sdk/_testing/data/search/search.py b/src/globus_sdk/testing/data/search/search.py similarity index 92% rename from src/globus_sdk/_testing/data/search/search.py rename to src/globus_sdk/testing/data/search/search.py index f2239532f..5ef1db55a 100644 --- a/src/globus_sdk/_testing/data/search/search.py +++ b/src/globus_sdk/testing/data/search/search.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet INDEX_ID = "60d1160b-f016-40b0-8545-99619865873d" diff --git a/src/globus_sdk/_testing/data/timer/__init__.py b/src/globus_sdk/testing/data/timer/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/timer/__init__.py rename to src/globus_sdk/testing/data/timer/__init__.py diff --git a/src/globus_sdk/_testing/data/timer/_common.py b/src/globus_sdk/testing/data/timer/_common.py similarity index 100% rename from src/globus_sdk/_testing/data/timer/_common.py rename to src/globus_sdk/testing/data/timer/_common.py diff --git a/src/globus_sdk/_testing/data/timer/create_job.py b/src/globus_sdk/testing/data/timer/create_job.py similarity index 93% rename from src/globus_sdk/_testing/data/timer/create_job.py rename to src/globus_sdk/testing/data/timer/create_job.py index bad50aea4..1a8e54867 100644 --- a/src/globus_sdk/_testing/data/timer/create_job.py +++ b/src/globus_sdk/testing/data/timer/create_job.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TIMER_ID, V1_TIMER diff --git a/src/globus_sdk/_testing/data/timer/create_timer.py b/src/globus_sdk/testing/data/timer/create_timer.py similarity index 86% rename from src/globus_sdk/_testing/data/timer/create_timer.py rename to src/globus_sdk/testing/data/timer/create_timer.py index 18a6b234c..9cdc86e2d 100644 --- a/src/globus_sdk/_testing/data/timer/create_timer.py +++ b/src/globus_sdk/testing/data/timer/create_timer.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import DEST_EP_ID, SOURCE_EP_ID, TIMER_ID, V2_TRANSFER_TIMER diff --git a/src/globus_sdk/_testing/data/timer/delete_job.py b/src/globus_sdk/testing/data/timer/delete_job.py similarity index 77% rename from src/globus_sdk/_testing/data/timer/delete_job.py rename to src/globus_sdk/testing/data/timer/delete_job.py index 3288f1bcb..f501b56f2 100644 --- a/src/globus_sdk/_testing/data/timer/delete_job.py +++ b/src/globus_sdk/testing/data/timer/delete_job.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TIMER_ID, V1_TIMER diff --git a/src/globus_sdk/_testing/data/timer/get_job.py b/src/globus_sdk/testing/data/timer/get_job.py similarity index 96% rename from src/globus_sdk/_testing/data/timer/get_job.py rename to src/globus_sdk/testing/data/timer/get_job.py index 0ccb489ee..fa587bfc9 100644 --- a/src/globus_sdk/_testing/data/timer/get_job.py +++ b/src/globus_sdk/testing/data/timer/get_job.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TIMER_ID, V1_TIMER diff --git a/src/globus_sdk/_testing/data/timer/list_jobs.py b/src/globus_sdk/testing/data/timer/list_jobs.py similarity index 77% rename from src/globus_sdk/_testing/data/timer/list_jobs.py rename to src/globus_sdk/testing/data/timer/list_jobs.py index ce9014465..18d9f3781 100644 --- a/src/globus_sdk/_testing/data/timer/list_jobs.py +++ b/src/globus_sdk/testing/data/timer/list_jobs.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TIMER_ID, V1_TIMER diff --git a/src/globus_sdk/_testing/data/timer/pause_job.py b/src/globus_sdk/testing/data/timer/pause_job.py similarity index 80% rename from src/globus_sdk/_testing/data/timer/pause_job.py rename to src/globus_sdk/testing/data/timer/pause_job.py index cb72ccb46..79e2c61a8 100644 --- a/src/globus_sdk/_testing/data/timer/pause_job.py +++ b/src/globus_sdk/testing/data/timer/pause_job.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TIMER_ID diff --git a/src/globus_sdk/_testing/data/timer/resume_job.py b/src/globus_sdk/testing/data/timer/resume_job.py similarity index 80% rename from src/globus_sdk/_testing/data/timer/resume_job.py rename to src/globus_sdk/testing/data/timer/resume_job.py index 971d863a6..51056e6d2 100644 --- a/src/globus_sdk/_testing/data/timer/resume_job.py +++ b/src/globus_sdk/testing/data/timer/resume_job.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TIMER_ID diff --git a/src/globus_sdk/_testing/data/timer/update_job.py b/src/globus_sdk/testing/data/timer/update_job.py similarity index 85% rename from src/globus_sdk/_testing/data/timer/update_job.py rename to src/globus_sdk/testing/data/timer/update_job.py index 0be527a80..ad89200b5 100644 --- a/src/globus_sdk/_testing/data/timer/update_job.py +++ b/src/globus_sdk/testing/data/timer/update_job.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TIMER_ID, V1_TIMER diff --git a/src/globus_sdk/_testing/data/transfer/__init__.py b/src/globus_sdk/testing/data/transfer/__init__.py similarity index 100% rename from src/globus_sdk/_testing/data/transfer/__init__.py rename to src/globus_sdk/testing/data/transfer/__init__.py diff --git a/src/globus_sdk/_testing/data/transfer/_common.py b/src/globus_sdk/testing/data/transfer/_common.py similarity index 100% rename from src/globus_sdk/_testing/data/transfer/_common.py rename to src/globus_sdk/testing/data/transfer/_common.py diff --git a/src/globus_sdk/_testing/data/transfer/create_endpoint.py b/src/globus_sdk/testing/data/transfer/create_endpoint.py similarity index 89% rename from src/globus_sdk/_testing/data/transfer/create_endpoint.py rename to src/globus_sdk/testing/data/transfer/create_endpoint.py index 7a5d9ce8e..4b8fa534a 100644 --- a/src/globus_sdk/_testing/data/transfer/create_endpoint.py +++ b/src/globus_sdk/testing/data/transfer/create_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/transfer/endpoint_manager_task_list.py b/src/globus_sdk/testing/data/transfer/endpoint_manager_task_list.py similarity index 98% rename from src/globus_sdk/_testing/data/transfer/endpoint_manager_task_list.py rename to src/globus_sdk/testing/data/transfer/endpoint_manager_task_list.py index 9b1897aed..49c41dc8d 100644 --- a/src/globus_sdk/_testing/data/transfer/endpoint_manager_task_list.py +++ b/src/globus_sdk/testing/data/transfer/endpoint_manager_task_list.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID as SRC_ENDPOINT_ID from ._common import TASK_ID diff --git a/src/globus_sdk/_testing/data/transfer/endpoint_manager_task_successful_transfers.py b/src/globus_sdk/testing/data/transfer/endpoint_manager_task_successful_transfers.py similarity index 90% rename from src/globus_sdk/_testing/data/transfer/endpoint_manager_task_successful_transfers.py rename to src/globus_sdk/testing/data/transfer/endpoint_manager_task_successful_transfers.py index b81c7b969..7d5af62a2 100644 --- a/src/globus_sdk/_testing/data/transfer/endpoint_manager_task_successful_transfers.py +++ b/src/globus_sdk/testing/data/transfer/endpoint_manager_task_successful_transfers.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import TASK_ID diff --git a/src/globus_sdk/_testing/data/transfer/get_endpoint.py b/src/globus_sdk/testing/data/transfer/get_endpoint.py similarity index 95% rename from src/globus_sdk/_testing/data/transfer/get_endpoint.py rename to src/globus_sdk/testing/data/transfer/get_endpoint.py index b0112132b..13e18cedf 100644 --- a/src/globus_sdk/_testing/data/transfer/get_endpoint.py +++ b/src/globus_sdk/testing/data/transfer/get_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/transfer/get_submission_id.py b/src/globus_sdk/testing/data/transfer/get_submission_id.py similarity index 78% rename from src/globus_sdk/_testing/data/transfer/get_submission_id.py rename to src/globus_sdk/testing/data/transfer/get_submission_id.py index 077dac261..4a4eb925c 100644 --- a/src/globus_sdk/_testing/data/transfer/get_submission_id.py +++ b/src/globus_sdk/testing/data/transfer/get_submission_id.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import SUBMISSION_ID diff --git a/src/globus_sdk/_testing/data/transfer/operation_mkdir.py b/src/globus_sdk/testing/data/transfer/operation_mkdir.py similarity index 88% rename from src/globus_sdk/_testing/data/transfer/operation_mkdir.py rename to src/globus_sdk/testing/data/transfer/operation_mkdir.py index aa4beb5c6..0e64fd036 100644 --- a/src/globus_sdk/_testing/data/transfer/operation_mkdir.py +++ b/src/globus_sdk/testing/data/transfer/operation_mkdir.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/transfer/operation_rename.py b/src/globus_sdk/testing/data/transfer/operation_rename.py similarity index 88% rename from src/globus_sdk/_testing/data/transfer/operation_rename.py rename to src/globus_sdk/testing/data/transfer/operation_rename.py index 9db38edb4..d49b5790d 100644 --- a/src/globus_sdk/_testing/data/transfer/operation_rename.py +++ b/src/globus_sdk/testing/data/transfer/operation_rename.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/transfer/operation_stat.py b/src/globus_sdk/testing/data/transfer/operation_stat.py similarity index 96% rename from src/globus_sdk/_testing/data/transfer/operation_stat.py rename to src/globus_sdk/testing/data/transfer/operation_stat.py index a59f72a84..4121557eb 100644 --- a/src/globus_sdk/_testing/data/transfer/operation_stat.py +++ b/src/globus_sdk/testing/data/transfer/operation_stat.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/data/transfer/set_subscription_admin_verified.py b/src/globus_sdk/testing/data/transfer/set_subscription_admin_verified.py similarity index 97% rename from src/globus_sdk/_testing/data/transfer/set_subscription_admin_verified.py rename to src/globus_sdk/testing/data/transfer/set_subscription_admin_verified.py index 3a557a4ed..45fd3749c 100644 --- a/src/globus_sdk/_testing/data/transfer/set_subscription_admin_verified.py +++ b/src/globus_sdk/testing/data/transfer/set_subscription_admin_verified.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID, SUBSCRIPTION_ID diff --git a/src/globus_sdk/_testing/data/transfer/set_subscription_id.py b/src/globus_sdk/testing/data/transfer/set_subscription_id.py similarity index 96% rename from src/globus_sdk/_testing/data/transfer/set_subscription_id.py rename to src/globus_sdk/testing/data/transfer/set_subscription_id.py index d829cea84..ac087a641 100644 --- a/src/globus_sdk/_testing/data/transfer/set_subscription_id.py +++ b/src/globus_sdk/testing/data/transfer/set_subscription_id.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID, SUBSCRIPTION_ID diff --git a/src/globus_sdk/_testing/data/transfer/submit_delete.py b/src/globus_sdk/testing/data/transfer/submit_delete.py similarity index 92% rename from src/globus_sdk/_testing/data/transfer/submit_delete.py rename to src/globus_sdk/testing/data/transfer/submit_delete.py index 5ffa6b7c9..ba682034c 100644 --- a/src/globus_sdk/_testing/data/transfer/submit_delete.py +++ b/src/globus_sdk/testing/data/transfer/submit_delete.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import SUBMISSION_ID, TASK_ID diff --git a/src/globus_sdk/_testing/data/transfer/submit_transfer.py b/src/globus_sdk/testing/data/transfer/submit_transfer.py similarity index 95% rename from src/globus_sdk/_testing/data/transfer/submit_transfer.py rename to src/globus_sdk/testing/data/transfer/submit_transfer.py index a76d1878b..f204aa1a0 100644 --- a/src/globus_sdk/_testing/data/transfer/submit_transfer.py +++ b/src/globus_sdk/testing/data/transfer/submit_transfer.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import SUBMISSION_ID, TASK_ID diff --git a/src/globus_sdk/_testing/data/transfer/task_list.py b/src/globus_sdk/testing/data/transfer/task_list.py similarity index 97% rename from src/globus_sdk/_testing/data/transfer/task_list.py rename to src/globus_sdk/testing/data/transfer/task_list.py index 0903fe748..76b115c38 100644 --- a/src/globus_sdk/_testing/data/transfer/task_list.py +++ b/src/globus_sdk/testing/data/transfer/task_list.py @@ -1,6 +1,6 @@ import uuid -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet source_id = str(uuid.uuid4()) destination_id = str(uuid.uuid4()) diff --git a/src/globus_sdk/_testing/data/transfer/update_endpoint.py b/src/globus_sdk/testing/data/transfer/update_endpoint.py similarity index 87% rename from src/globus_sdk/_testing/data/transfer/update_endpoint.py rename to src/globus_sdk/testing/data/transfer/update_endpoint.py index 82220d6b7..a3185a61a 100644 --- a/src/globus_sdk/_testing/data/transfer/update_endpoint.py +++ b/src/globus_sdk/testing/data/transfer/update_endpoint.py @@ -1,4 +1,4 @@ -from globus_sdk._testing.models import RegisteredResponse, ResponseSet +from globus_sdk.testing.models import RegisteredResponse, ResponseSet from ._common import ENDPOINT_ID diff --git a/src/globus_sdk/_testing/helpers.py b/src/globus_sdk/testing/helpers.py similarity index 100% rename from src/globus_sdk/_testing/helpers.py rename to src/globus_sdk/testing/helpers.py diff --git a/src/globus_sdk/_testing/models.py b/src/globus_sdk/testing/models.py similarity index 100% rename from src/globus_sdk/_testing/models.py rename to src/globus_sdk/testing/models.py diff --git a/src/globus_sdk/_testing/registry.py b/src/globus_sdk/testing/registry.py similarity index 96% rename from src/globus_sdk/_testing/registry.py rename to src/globus_sdk/testing/registry.py index 0f9c3cee9..b575f1e0e 100644 --- a/src/globus_sdk/_testing/registry.py +++ b/src/globus_sdk/testing/registry.py @@ -85,17 +85,17 @@ def get_response_set(set_id: t.Any) -> ResponseSet: # if ID is a string, it's the (optionally dotted) name of a module if isinstance(set_id, str): - module_name = f"globus_sdk._testing.data.{set_id}" + module_name = f"globus_sdk.testing.data.{set_id}" else: assert hasattr( set_id, "__qualname__" ), f"cannot load response set from {type(set_id)}" # support modules like - # globus_sdk/_testing/data/auth/get_identities.py + # globus_sdk/testing/data/auth/get_identities.py # for lookups like # get_response_set(AuthClient.get_identities) module_name = ( - f"globus_sdk._testing.data.{_resolve_qualname(set_id.__qualname__)}" + f"globus_sdk.testing.data.{_resolve_qualname(set_id.__qualname__)}" ) # after that, check the built-in "registry" built from modules diff --git a/tests/functional/base_client/test_advanced_http_options.py b/tests/functional/base_client/test_advanced_http_options.py index b3d1e91d2..61c3640d9 100644 --- a/tests/functional/base_client/test_advanced_http_options.py +++ b/tests/functional/base_client/test_advanced_http_options.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import RegisteredResponse, load_response +from globus_sdk.testing import RegisteredResponse, load_response def test_allow_redirects_false(client): diff --git a/tests/functional/base_client/test_default_headers.py b/tests/functional/base_client/test_default_headers.py index 8629d7a3a..258f5389f 100644 --- a/tests/functional/base_client/test_default_headers.py +++ b/tests/functional/base_client/test_default_headers.py @@ -1,5 +1,5 @@ from globus_sdk import __version__ -from globus_sdk._testing import RegisteredResponse, get_last_request +from globus_sdk.testing import RegisteredResponse, get_last_request def test_clientinfo_header_default(client): diff --git a/tests/functional/base_client/test_filter_missing.py b/tests/functional/base_client/test_filter_missing.py index 127994ef9..f1b10c422 100644 --- a/tests/functional/base_client/test_filter_missing.py +++ b/tests/functional/base_client/test_filter_missing.py @@ -4,7 +4,7 @@ import pytest from globus_sdk import MISSING -from globus_sdk._testing import RegisteredResponse, get_last_request, load_response +from globus_sdk.testing import RegisteredResponse, get_last_request, load_response @pytest.fixture(autouse=True) diff --git a/tests/functional/base_client/test_retry_behavior.py b/tests/functional/base_client/test_retry_behavior.py index 8c8e67ac9..edabc272d 100644 --- a/tests/functional/base_client/test_retry_behavior.py +++ b/tests/functional/base_client/test_retry_behavior.py @@ -2,7 +2,7 @@ import requests import globus_sdk -from globus_sdk._testing import RegisteredResponse, load_response +from globus_sdk.testing import RegisteredResponse, load_response @pytest.mark.parametrize("error_status", [500, 429, 502, 503, 504]) diff --git a/tests/functional/globus_app/test_globus_app_token_handling.py b/tests/functional/globus_app/test_globus_app_token_handling.py index ecf7e8810..4c2188643 100644 --- a/tests/functional/globus_app/test_globus_app_token_handling.py +++ b/tests/functional/globus_app/test_globus_app_token_handling.py @@ -5,7 +5,7 @@ import globus_sdk import globus_sdk.token_storage -from globus_sdk._testing import RegisteredResponse, load_response +from globus_sdk.testing import RegisteredResponse, load_response # the JWT will have a client ID in its audience claim # make sure to use that value when trying to decode it diff --git a/tests/functional/local_endpoint/test_personal.py b/tests/functional/local_endpoint/test_personal.py index 027e2a4c6..3f6dad88d 100644 --- a/tests/functional/local_endpoint/test_personal.py +++ b/tests/functional/local_endpoint/test_personal.py @@ -6,7 +6,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response _IS_WINDOWS = os.name == "nt" diff --git a/tests/functional/login_flows/test_login_flow_manager.py b/tests/functional/login_flows/test_login_flow_manager.py index 4b951c687..5b0773bf8 100644 --- a/tests/functional/login_flows/test_login_flow_manager.py +++ b/tests/functional/login_flows/test_login_flow_manager.py @@ -3,7 +3,6 @@ import pytest from globus_sdk import ConfidentialAppAuthClient, NativeAppAuthClient -from globus_sdk._testing import load_response from globus_sdk.gare import GlobusAuthorizationParameters from globus_sdk.login_flows import ( CommandLineLoginFlowManager, @@ -12,6 +11,7 @@ from globus_sdk.login_flows.command_line_login_flow_manager import ( CommandLineLoginFlowEOFError, ) +from globus_sdk.testing import load_response def _mock_input(s): diff --git a/tests/functional/services/auth/base/test_oauth2_revoke_token.py b/tests/functional/services/auth/base/test_oauth2_revoke_token.py index 725fae17e..df31d6614 100644 --- a/tests/functional/services/auth/base/test_oauth2_revoke_token.py +++ b/tests/functional/services/auth/base/test_oauth2_revoke_token.py @@ -4,7 +4,7 @@ import pytest import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.fixture diff --git a/tests/functional/services/auth/base/test_oauth2_validate_token.py b/tests/functional/services/auth/base/test_oauth2_validate_token.py index 1e67a8d91..af766fbeb 100644 --- a/tests/functional/services/auth/base/test_oauth2_validate_token.py +++ b/tests/functional/services/auth/base/test_oauth2_validate_token.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import RegisteredResponse, load_response +from globus_sdk.testing import RegisteredResponse, load_response def test_oauth2_validate_token_emits_deprecation_warning(): diff --git a/tests/functional/services/auth/confidential_client/test_create_child_client.py b/tests/functional/services/auth/confidential_client/test_create_child_client.py index 340247213..e8371ccd7 100644 --- a/tests/functional/services/auth/confidential_client/test_create_child_client.py +++ b/tests/functional/services/auth/confidential_client/test_create_child_client.py @@ -3,7 +3,7 @@ import pytest from globus_sdk import GlobusSDKUsageError -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/confidential_client/test_oauth2_client_credentials_tokens.py b/tests/functional/services/auth/confidential_client/test_oauth2_client_credentials_tokens.py index 20faf6ebb..9aef09995 100644 --- a/tests/functional/services/auth/confidential_client/test_oauth2_client_credentials_tokens.py +++ b/tests/functional/services/auth/confidential_client/test_oauth2_client_credentials_tokens.py @@ -1,7 +1,7 @@ import urllib.parse -from globus_sdk._testing import get_last_request, load_response from globus_sdk.scopes import Scope +from globus_sdk.testing import get_last_request, load_response def test_oauth2_client_credentials_tokens(auth_client): diff --git a/tests/functional/services/auth/confidential_client/test_oauth2_get_dependent_tokens.py b/tests/functional/services/auth/confidential_client/test_oauth2_get_dependent_tokens.py index 67efc5c21..c6570152e 100644 --- a/tests/functional/services/auth/confidential_client/test_oauth2_get_dependent_tokens.py +++ b/tests/functional/services/auth/confidential_client/test_oauth2_get_dependent_tokens.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_oauth2_get_dependent_tokens(auth_client): diff --git a/tests/functional/services/auth/confidential_client/test_oauth2_token_introspect.py b/tests/functional/services/auth/confidential_client/test_oauth2_token_introspect.py index f31a1939f..8ed54f812 100644 --- a/tests/functional/services/auth/confidential_client/test_oauth2_token_introspect.py +++ b/tests/functional/services/auth/confidential_client/test_oauth2_token_introspect.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_oauth2_token_introspect(auth_client): diff --git a/tests/functional/services/auth/native_client/test_create_native_app_instance.py b/tests/functional/services/auth/native_client/test_create_native_app_instance.py index dd52a6d9d..2b9b07cba 100644 --- a/tests/functional/services/auth/native_client/test_create_native_app_instance.py +++ b/tests/functional/services/auth/native_client/test_create_native_app_instance.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_create_client.py b/tests/functional/services/auth/service_client/test_create_client.py index 7643c99d5..1fa5b6432 100644 --- a/tests/functional/services/auth/service_client/test_create_client.py +++ b/tests/functional/services/auth/service_client/test_create_client.py @@ -5,7 +5,7 @@ import pytest from globus_sdk import GlobusSDKUsageError -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_create_client_credential.py b/tests/functional/services/auth/service_client/test_create_client_credential.py index 6096acb58..a718b65e7 100644 --- a/tests/functional/services/auth/service_client/test_create_client_credential.py +++ b/tests/functional/services/auth/service_client/test_create_client_credential.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize("uuid_type", (str, uuid.UUID)) diff --git a/tests/functional/services/auth/service_client/test_create_policy.py b/tests/functional/services/auth/service_client/test_create_policy.py index 5c204ea22..7d61f4a93 100644 --- a/tests/functional/services/auth/service_client/test_create_policy.py +++ b/tests/functional/services/auth/service_client/test_create_policy.py @@ -5,7 +5,7 @@ import pytest from globus_sdk import exc -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_create_project.py b/tests/functional/services/auth/service_client/test_create_project.py index 0caba212a..c649945b3 100644 --- a/tests/functional/services/auth/service_client/test_create_project.py +++ b/tests/functional/services/auth/service_client/test_create_project.py @@ -3,7 +3,7 @@ import pytest -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_create_scope.py b/tests/functional/services/auth/service_client/test_create_scope.py index c7ea900f0..ae0b6e5a8 100644 --- a/tests/functional/services/auth/service_client/test_create_scope.py +++ b/tests/functional/services/auth/service_client/test_create_scope.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_delete_client.py b/tests/functional/services/auth/service_client/test_delete_client.py index af4c20fa3..b03aff940 100644 --- a/tests/functional/services/auth/service_client/test_delete_client.py +++ b/tests/functional/services/auth/service_client/test_delete_client.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_delete_client_credential.py b/tests/functional/services/auth/service_client/test_delete_client_credential.py index 01cf8ff1a..22dd6da43 100644 --- a/tests/functional/services/auth/service_client/test_delete_client_credential.py +++ b/tests/functional/services/auth/service_client/test_delete_client_credential.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_delete_policy.py b/tests/functional/services/auth/service_client/test_delete_policy.py index 538554c42..39c0a3d7f 100644 --- a/tests/functional/services/auth/service_client/test_delete_policy.py +++ b/tests/functional/services/auth/service_client/test_delete_policy.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_delete_project.py b/tests/functional/services/auth/service_client/test_delete_project.py index b4c55b42a..f0946cb2b 100644 --- a/tests/functional/services/auth/service_client/test_delete_project.py +++ b/tests/functional/services/auth/service_client/test_delete_project.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_delete_project(service_client): diff --git a/tests/functional/services/auth/service_client/test_delete_scope.py b/tests/functional/services/auth/service_client/test_delete_scope.py index bd672f272..48e398b34 100644 --- a/tests/functional/services/auth/service_client/test_delete_scope.py +++ b/tests/functional/services/auth/service_client/test_delete_scope.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_get_client.py b/tests/functional/services/auth/service_client/test_get_client.py index 478f55ef8..5ed5717fb 100644 --- a/tests/functional/services/auth/service_client/test_get_client.py +++ b/tests/functional/services/auth/service_client/test_get_client.py @@ -5,7 +5,7 @@ import pytest from globus_sdk import GlobusSDKUsageError -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_get_client_credentials.py b/tests/functional/services/auth/service_client/test_get_client_credentials.py index 9cbc97992..868669805 100644 --- a/tests/functional/services/auth/service_client/test_get_client_credentials.py +++ b/tests/functional/services/auth/service_client/test_get_client_credentials.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_get_clients.py b/tests/functional/services/auth/service_client/test_get_clients.py index 6565fe22d..5d670ce90 100644 --- a/tests/functional/services/auth/service_client/test_get_clients.py +++ b/tests/functional/services/auth/service_client/test_get_clients.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_clients(service_client): diff --git a/tests/functional/services/auth/service_client/test_get_consents.py b/tests/functional/services/auth/service_client/test_get_consents.py index 792b47d0b..c7cf2dea6 100644 --- a/tests/functional/services/auth/service_client/test_get_consents.py +++ b/tests/functional/services/auth/service_client/test_get_consents.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_consents(service_client): diff --git a/tests/functional/services/auth/service_client/test_get_identities.py b/tests/functional/services/auth/service_client/test_get_identities.py index 2efc29bfb..453643ad2 100644 --- a/tests/functional/services/auth/service_client/test_get_identities.py +++ b/tests/functional/services/auth/service_client/test_get_identities.py @@ -3,7 +3,7 @@ import pytest import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response class StringWrapper: diff --git a/tests/functional/services/auth/service_client/test_get_identity_providers.py b/tests/functional/services/auth/service_client/test_get_identity_providers.py index e7e3b7e49..3c7d041a3 100644 --- a/tests/functional/services/auth/service_client/test_get_identity_providers.py +++ b/tests/functional/services/auth/service_client/test_get_identity_providers.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_get_identity_providers_by_domains(service_client): diff --git a/tests/functional/services/auth/service_client/test_get_policies.py b/tests/functional/services/auth/service_client/test_get_policies.py index 69f8ae4d5..38579ccd4 100644 --- a/tests/functional/services/auth/service_client/test_get_policies.py +++ b/tests/functional/services/auth/service_client/test_get_policies.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_policies(service_client): diff --git a/tests/functional/services/auth/service_client/test_get_policy.py b/tests/functional/services/auth/service_client/test_get_policy.py index 1a06e5004..9f4df5da9 100644 --- a/tests/functional/services/auth/service_client/test_get_policy.py +++ b/tests/functional/services/auth/service_client/test_get_policy.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_get_project.py b/tests/functional/services/auth/service_client/test_get_project.py index f809a3d41..d817fadf6 100644 --- a/tests/functional/services/auth/service_client/test_get_project.py +++ b/tests/functional/services/auth/service_client/test_get_project.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_get_projects.py b/tests/functional/services/auth/service_client/test_get_projects.py index 35f15df47..e6336c42a 100644 --- a/tests/functional/services/auth/service_client/test_get_projects.py +++ b/tests/functional/services/auth/service_client/test_get_projects.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_projects(service_client): diff --git a/tests/functional/services/auth/service_client/test_get_scope.py b/tests/functional/services/auth/service_client/test_get_scope.py index bf13cac7d..249bd62e0 100644 --- a/tests/functional/services/auth/service_client/test_get_scope.py +++ b/tests/functional/services/auth/service_client/test_get_scope.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_get_scopes.py b/tests/functional/services/auth/service_client/test_get_scopes.py index 760cea606..2f4354257 100644 --- a/tests/functional/services/auth/service_client/test_get_scopes.py +++ b/tests/functional/services/auth/service_client/test_get_scopes.py @@ -1,7 +1,7 @@ import pytest from globus_sdk import GlobusSDKUsageError -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_scopes(service_client): diff --git a/tests/functional/services/auth/service_client/test_update_client.py b/tests/functional/services/auth/service_client/test_update_client.py index 687a42582..efd25c64c 100644 --- a/tests/functional/services/auth/service_client/test_update_client.py +++ b/tests/functional/services/auth/service_client/test_update_client.py @@ -5,7 +5,7 @@ import pytest from globus_sdk import GlobusSDKUsageError -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_update_policy.py b/tests/functional/services/auth/service_client/test_update_policy.py index b68350e18..ca981807f 100644 --- a/tests/functional/services/auth/service_client/test_update_policy.py +++ b/tests/functional/services/auth/service_client/test_update_policy.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_update_project.py b/tests/functional/services/auth/service_client/test_update_project.py index c755dbd32..185b7a6ff 100644 --- a/tests/functional/services/auth/service_client/test_update_project.py +++ b/tests/functional/services/auth/service_client/test_update_project.py @@ -4,7 +4,7 @@ import pytest from globus_sdk._missing import MISSING, filter_missing -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_update_scope.py b/tests/functional/services/auth/service_client/test_update_scope.py index 956325222..e3bed2cdc 100644 --- a/tests/functional/services/auth/service_client/test_update_scope.py +++ b/tests/functional/services/auth/service_client/test_update_scope.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/auth/service_client/test_userinfo.py b/tests/functional/services/auth/service_client/test_userinfo.py index 3ecd1dee7..5d8ff6263 100644 --- a/tests/functional/services/auth/service_client/test_userinfo.py +++ b/tests/functional/services/auth/service_client/test_userinfo.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response # TODO: add data for the success case and test it diff --git a/tests/functional/services/auth/test_auth_client_flow.py b/tests/functional/services/auth/test_auth_client_flow.py index c31606a2b..c0549dfdd 100644 --- a/tests/functional/services/auth/test_auth_client_flow.py +++ b/tests/functional/services/auth/test_auth_client_flow.py @@ -5,9 +5,9 @@ import globus_sdk from globus_sdk._missing import MISSING -from globus_sdk._testing import load_response from globus_sdk.scopes import TransferScopes from globus_sdk.services.auth.flow_managers.native_app import _make_native_app_challenge +from globus_sdk.testing import load_response CLIENT_ID = "d0f1d9b0-bd81-4108-be74-ea981664453a" diff --git a/tests/functional/services/auth/test_identity_map.py b/tests/functional/services/auth/test_identity_map.py index 8c944273c..46b18eef3 100644 --- a/tests/functional/services/auth/test_identity_map.py +++ b/tests/functional/services/auth/test_identity_map.py @@ -2,7 +2,7 @@ import responses import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response IDENTITIES_MULTIPLE_RESPONSE = { "identities": [ diff --git a/tests/functional/services/compute/v2/test_delete_endpoint.py b/tests/functional/services/compute/v2/test_delete_endpoint.py index 0ab619080..a3043c45c 100644 --- a/tests/functional/services/compute/v2/test_delete_endpoint.py +++ b/tests/functional/services/compute/v2/test_delete_endpoint.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_delete_endpoint(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_delete_function.py b/tests/functional/services/compute/v2/test_delete_function.py index eab3f08b4..d10d9377a 100644 --- a/tests/functional/services/compute/v2/test_delete_function.py +++ b/tests/functional/services/compute/v2/test_delete_function.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_delete_function(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_endpoint.py b/tests/functional/services/compute/v2/test_get_endpoint.py index 58dd98019..0a8366e5c 100644 --- a/tests/functional/services/compute/v2/test_get_endpoint.py +++ b/tests/functional/services/compute/v2/test_get_endpoint.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_endpoint(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_endpoint_status.py b/tests/functional/services/compute/v2/test_get_endpoint_status.py index 487530e63..b8a00b992 100644 --- a/tests/functional/services/compute/v2/test_get_endpoint_status.py +++ b/tests/functional/services/compute/v2/test_get_endpoint_status.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_endpoint_status(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_endpoints.py b/tests/functional/services/compute/v2/test_get_endpoints.py index 4c8e07eb5..268fa29db 100644 --- a/tests/functional/services/compute/v2/test_get_endpoints.py +++ b/tests/functional/services/compute/v2/test_get_endpoints.py @@ -1,7 +1,7 @@ import urllib.parse import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_get_endpoints(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_function.py b/tests/functional/services/compute/v2/test_get_function.py index 1da30dbea..c5867b218 100644 --- a/tests/functional/services/compute/v2/test_get_function.py +++ b/tests/functional/services/compute/v2/test_get_function.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_function(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_result_amqp_url.py b/tests/functional/services/compute/v2/test_get_result_amqp_url.py index 6f148bac6..6c1edd2dc 100644 --- a/tests/functional/services/compute/v2/test_get_result_amqp_url.py +++ b/tests/functional/services/compute/v2/test_get_result_amqp_url.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_result_amqp_url(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_task_batch.py b/tests/functional/services/compute/v2/test_get_task_batch.py index 4bdcaafad..190bd2e0f 100644 --- a/tests/functional/services/compute/v2/test_get_task_batch.py +++ b/tests/functional/services/compute/v2/test_get_task_batch.py @@ -4,7 +4,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/compute/v2/test_get_task_group.py b/tests/functional/services/compute/v2/test_get_task_group.py index dc2368d39..34a2c7660 100644 --- a/tests/functional/services/compute/v2/test_get_task_group.py +++ b/tests/functional/services/compute/v2/test_get_task_group.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_task_group(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_task_info.py b/tests/functional/services/compute/v2/test_get_task_info.py index aeadccf10..2394a9af2 100644 --- a/tests/functional/services/compute/v2/test_get_task_info.py +++ b/tests/functional/services/compute/v2/test_get_task_info.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_task(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_get_version.py b/tests/functional/services/compute/v2/test_get_version.py index 6b2b8594e..3b287b6dd 100644 --- a/tests/functional/services/compute/v2/test_get_version.py +++ b/tests/functional/services/compute/v2/test_get_version.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_version(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_lock_endpoint.py b/tests/functional/services/compute/v2/test_lock_endpoint.py index 1848212a6..2f3736c02 100644 --- a/tests/functional/services/compute/v2/test_lock_endpoint.py +++ b/tests/functional/services/compute/v2/test_lock_endpoint.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_lock_endpoint(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_register_endpoint.py b/tests/functional/services/compute/v2/test_register_endpoint.py index 6d9d094f0..66310dabe 100644 --- a/tests/functional/services/compute/v2/test_register_endpoint.py +++ b/tests/functional/services/compute/v2/test_register_endpoint.py @@ -1,7 +1,7 @@ import uuid import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response ENDPOINT_CONFIG = """ display_name: My Endpoint diff --git a/tests/functional/services/compute/v2/test_register_function.py b/tests/functional/services/compute/v2/test_register_function.py index 20b0e966d..7a93bd598 100644 --- a/tests/functional/services/compute/v2/test_register_function.py +++ b/tests/functional/services/compute/v2/test_register_function.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_register_function(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v2/test_submit.py b/tests/functional/services/compute/v2/test_submit.py index 90bc307f4..a208f258e 100644 --- a/tests/functional/services/compute/v2/test_submit.py +++ b/tests/functional/services/compute/v2/test_submit.py @@ -1,7 +1,7 @@ import uuid import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_submit(compute_client_v2: globus_sdk.ComputeClientV2): diff --git a/tests/functional/services/compute/v3/test_get_endpoint_allowlist.py b/tests/functional/services/compute/v3/test_get_endpoint_allowlist.py index 5c5ac653a..72ab162ec 100644 --- a/tests/functional/services/compute/v3/test_get_endpoint_allowlist.py +++ b/tests/functional/services/compute/v3/test_get_endpoint_allowlist.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_endpoint_allowlist(compute_client_v3: globus_sdk.ComputeClientV3): diff --git a/tests/functional/services/compute/v3/test_lock_endpoint.py b/tests/functional/services/compute/v3/test_lock_endpoint.py index d2d7558c4..6b91718c8 100644 --- a/tests/functional/services/compute/v3/test_lock_endpoint.py +++ b/tests/functional/services/compute/v3/test_lock_endpoint.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_lock_endpoint(compute_client_v3: globus_sdk.ComputeClientV3): diff --git a/tests/functional/services/compute/v3/test_register_endpoint.py b/tests/functional/services/compute/v3/test_register_endpoint.py index 94abfe5bb..945a9be30 100644 --- a/tests/functional/services/compute/v3/test_register_endpoint.py +++ b/tests/functional/services/compute/v3/test_register_endpoint.py @@ -1,7 +1,7 @@ import uuid import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response ENDPOINT_CONFIG = """ display_name: My Endpoint diff --git a/tests/functional/services/compute/v3/test_register_function.py b/tests/functional/services/compute/v3/test_register_function.py index c16ff0d74..77990b457 100644 --- a/tests/functional/services/compute/v3/test_register_function.py +++ b/tests/functional/services/compute/v3/test_register_function.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_register_function(compute_client_v3: globus_sdk.ComputeClientV3): diff --git a/tests/functional/services/compute/v3/test_submit.py b/tests/functional/services/compute/v3/test_submit.py index 2560938c6..2e5f02f6a 100644 --- a/tests/functional/services/compute/v3/test_submit.py +++ b/tests/functional/services/compute/v3/test_submit.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_submit(compute_client_v3: globus_sdk.ComputeClientV3): diff --git a/tests/functional/services/compute/v3/test_update_endpoint.py b/tests/functional/services/compute/v3/test_update_endpoint.py index 987680e7c..e7830e902 100644 --- a/tests/functional/services/compute/v3/test_update_endpoint.py +++ b/tests/functional/services/compute/v3/test_update_endpoint.py @@ -1,7 +1,7 @@ import uuid import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response ENDPOINT_CONFIG = """ display_name: My Endpoint diff --git a/tests/functional/services/flows/test_flow_crud.py b/tests/functional/services/flows/test_flow_crud.py index 750b8cf82..df1ef8502 100644 --- a/tests/functional/services/flows/test_flow_crud.py +++ b/tests/functional/services/flows/test_flow_crud.py @@ -4,8 +4,8 @@ from responses import matchers from globus_sdk import MISSING, FlowsAPIError -from globus_sdk._testing import get_last_request, load_response -from globus_sdk._testing.models import RegisteredResponse +from globus_sdk.testing import get_last_request, load_response +from globus_sdk.testing.models import RegisteredResponse @pytest.mark.parametrize("subscription_id", [MISSING, None, "dummy_subscription_id"]) diff --git a/tests/functional/services/flows/test_flow_validate.py b/tests/functional/services/flows/test_flow_validate.py index 668de99e2..0497343a2 100644 --- a/tests/functional/services/flows/test_flow_validate.py +++ b/tests/functional/services/flows/test_flow_validate.py @@ -3,7 +3,7 @@ import pytest from globus_sdk import MISSING, FlowsAPIError -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize("input_schema", [MISSING, {}]) diff --git a/tests/functional/services/flows/test_get_run.py b/tests/functional/services/flows/test_get_run.py index 7944c572f..cf50b3a42 100644 --- a/tests/functional/services/flows/test_get_run.py +++ b/tests/functional/services/flows/test_get_run.py @@ -1,7 +1,7 @@ import pytest from globus_sdk import MISSING -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize("include_flow_description", (MISSING, False, True)) diff --git a/tests/functional/services/flows/test_get_run_logs.py b/tests/functional/services/flows/test_get_run_logs.py index 70961659a..5ff00eb6e 100644 --- a/tests/functional/services/flows/test_get_run_logs.py +++ b/tests/functional/services/flows/test_get_run_logs.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_run_logs(flows_client): diff --git a/tests/functional/services/flows/test_list_flows.py b/tests/functional/services/flows/test_list_flows.py index 6cffff532..4d7239b81 100644 --- a/tests/functional/services/flows/test_list_flows.py +++ b/tests/functional/services/flows/test_list_flows.py @@ -3,7 +3,7 @@ import pytest from globus_sdk import MISSING, GlobusSDKUsageError, RemovedInV4Warning -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize("filter_fulltext", [MISSING, "foo"]) diff --git a/tests/functional/services/flows/test_list_runs.py b/tests/functional/services/flows/test_list_runs.py index 9edc08a32..350adae1b 100644 --- a/tests/functional/services/flows/test_list_runs.py +++ b/tests/functional/services/flows/test_list_runs.py @@ -4,7 +4,7 @@ import pytest from globus_sdk import MISSING -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_list_runs_simple(flows_client): diff --git a/tests/functional/services/flows/test_resume_run.py b/tests/functional/services/flows/test_resume_run.py index 6ff23307b..bd1bfbc83 100644 --- a/tests/functional/services/flows/test_resume_run.py +++ b/tests/functional/services/flows/test_resume_run.py @@ -1,7 +1,7 @@ import typing as t from globus_sdk import SpecificFlowClient -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_resume_run(specific_flow_client_class: t.Type[SpecificFlowClient]): diff --git a/tests/functional/services/flows/test_run_crud.py b/tests/functional/services/flows/test_run_crud.py index d8596971b..e9c30de53 100644 --- a/tests/functional/services/flows/test_run_crud.py +++ b/tests/functional/services/flows/test_run_crud.py @@ -3,7 +3,7 @@ import pytest from globus_sdk import FlowsAPIError -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_get_run_definition(flows_client): diff --git a/tests/functional/services/flows/test_run_flow.py b/tests/functional/services/flows/test_run_flow.py index c836b5911..116ba3876 100644 --- a/tests/functional/services/flows/test_run_flow.py +++ b/tests/functional/services/flows/test_run_flow.py @@ -6,7 +6,7 @@ import globus_sdk from globus_sdk import FlowsAPIError, SpecificFlowClient -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_run_flow(specific_flow_client_class: type[SpecificFlowClient]): diff --git a/tests/functional/services/flows/test_validate_run.py b/tests/functional/services/flows/test_validate_run.py index 20e3ba1d8..980392c71 100644 --- a/tests/functional/services/flows/test_validate_run.py +++ b/tests/functional/services/flows/test_validate_run.py @@ -3,7 +3,7 @@ import pytest from globus_sdk import FlowsAPIError, SpecificFlowClient -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_validate_run(specific_flow_client_class: type[SpecificFlowClient]): diff --git a/tests/functional/services/gcs/test_endpoints.py b/tests/functional/services/gcs/test_endpoints.py index 34499ed9c..2c4de1f51 100644 --- a/tests/functional/services/gcs/test_endpoints.py +++ b/tests/functional/services/gcs/test_endpoints.py @@ -1,5 +1,5 @@ import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_endpoint(client): diff --git a/tests/functional/services/gcs/test_get_collection_list.py b/tests/functional/services/gcs/test_get_collection_list.py index 95ec90a3f..eae2c7ee9 100644 --- a/tests/functional/services/gcs/test_get_collection_list.py +++ b/tests/functional/services/gcs/test_get_collection_list.py @@ -1,7 +1,7 @@ import pytest from globus_sdk import MISSING, GCSAPIError -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_get_collection_list(client): diff --git a/tests/functional/services/gcs/test_get_gcs_info.py b/tests/functional/services/gcs/test_get_gcs_info.py index a20d1256e..8324dd8db 100644 --- a/tests/functional/services/gcs/test_get_gcs_info.py +++ b/tests/functional/services/gcs/test_get_gcs_info.py @@ -1,5 +1,5 @@ -from globus_sdk._testing import get_last_request, load_response from globus_sdk.authorizers import AccessTokenAuthorizer +from globus_sdk.testing import get_last_request, load_response def test_get_gcs_info(client): diff --git a/tests/functional/services/gcs/test_roles.py b/tests/functional/services/gcs/test_roles.py index 2fae98d2c..2bc545f7e 100644 --- a/tests/functional/services/gcs/test_roles.py +++ b/tests/functional/services/gcs/test_roles.py @@ -1,7 +1,7 @@ import json from globus_sdk import GCSRoleDocument -from globus_sdk._testing import get_last_request +from globus_sdk.testing import get_last_request from tests.common import register_api_route_fixture_file diff --git a/tests/functional/services/gcs/test_storage_gateways.py b/tests/functional/services/gcs/test_storage_gateways.py index 747d08cbe..f4c935ea0 100644 --- a/tests/functional/services/gcs/test_storage_gateways.py +++ b/tests/functional/services/gcs/test_storage_gateways.py @@ -4,7 +4,7 @@ import globus_sdk from globus_sdk import MISSING -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/gcs/test_user_credential.py b/tests/functional/services/gcs/test_user_credential.py index b302552ce..61c092d7d 100644 --- a/tests/functional/services/gcs/test_user_credential.py +++ b/tests/functional/services/gcs/test_user_credential.py @@ -1,7 +1,7 @@ import json from globus_sdk import ConnectorTable, UserCredentialDocument -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_get_user_credential_list(client): diff --git a/tests/functional/services/groups/test_create_group.py b/tests/functional/services/groups/test_create_group.py index 209a82361..b630a948c 100644 --- a/tests/functional/services/groups/test_create_group.py +++ b/tests/functional/services/groups/test_create_group.py @@ -1,6 +1,6 @@ import json -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_create_group(groups_client): diff --git a/tests/functional/services/groups/test_delete_group.py b/tests/functional/services/groups/test_delete_group.py index a3ff9a679..cf2b86361 100644 --- a/tests/functional/services/groups/test_delete_group.py +++ b/tests/functional/services/groups/test_delete_group.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_delete_group(groups_client): diff --git a/tests/functional/services/groups/test_get_group.py b/tests/functional/services/groups/test_get_group.py index 58ea84575..ed3902f04 100644 --- a/tests/functional/services/groups/test_get_group.py +++ b/tests/functional/services/groups/test_get_group.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_get_group(groups_client): diff --git a/tests/functional/services/groups/test_get_group_by_subscription_id.py b/tests/functional/services/groups/test_get_group_by_subscription_id.py index 455597503..432c4790f 100644 --- a/tests/functional/services/groups/test_get_group_by_subscription_id.py +++ b/tests/functional/services/groups/test_get_group_by_subscription_id.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_get_group_by_subscription_id(groups_client): diff --git a/tests/functional/services/groups/test_get_my_groups.py b/tests/functional/services/groups/test_get_my_groups.py index 6eaa2e375..e794b3f17 100644 --- a/tests/functional/services/groups/test_get_my_groups.py +++ b/tests/functional/services/groups/test_get_my_groups.py @@ -1,5 +1,5 @@ -from globus_sdk._testing import load_response from globus_sdk.response import ArrayResponse +from globus_sdk.testing import load_response def test_get_my_groups(groups_client): diff --git a/tests/functional/services/groups/test_group_memberships.py b/tests/functional/services/groups/test_group_memberships.py index eb8275ffb..769eeaeac 100644 --- a/tests/functional/services/groups/test_group_memberships.py +++ b/tests/functional/services/groups/test_group_memberships.py @@ -4,7 +4,7 @@ import pytest from globus_sdk import BatchMembershipActions, GroupRole -from globus_sdk._testing import RegisteredResponse, get_last_request, load_response +from globus_sdk.testing import RegisteredResponse, get_last_request, load_response from tests.common import register_api_route_fixture_file diff --git a/tests/functional/services/groups/test_set_group_policies.py b/tests/functional/services/groups/test_set_group_policies.py index 7c25b822c..e181ee1d4 100644 --- a/tests/functional/services/groups/test_set_group_policies.py +++ b/tests/functional/services/groups/test_set_group_policies.py @@ -9,7 +9,7 @@ GroupRequiredSignupFields, GroupVisibility, ) -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/search/test_batch_delete_by_subject.py b/tests/functional/services/search/test_batch_delete_by_subject.py index 1814380f1..c3cf2a2c7 100644 --- a/tests/functional/services/search/test_batch_delete_by_subject.py +++ b/tests/functional/services/search/test_batch_delete_by_subject.py @@ -1,6 +1,6 @@ import json -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_batch_delete_by_subject(client): diff --git a/tests/functional/services/search/test_create_index.py b/tests/functional/services/search/test_create_index.py index e2310d6d7..93ad691d5 100644 --- a/tests/functional/services/search/test_create_index.py +++ b/tests/functional/services/search/test_create_index.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_create_index(client): diff --git a/tests/functional/services/search/test_delete_index.py b/tests/functional/services/search/test_delete_index.py index 835c62b63..45d8f0fc3 100644 --- a/tests/functional/services/search/test_delete_index.py +++ b/tests/functional/services/search/test_delete_index.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_delete_index(client): diff --git a/tests/functional/services/search/test_index_list.py b/tests/functional/services/search/test_index_list.py index b66020272..be2d2b494 100644 --- a/tests/functional/services/search/test_index_list.py +++ b/tests/functional/services/search/test_index_list.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_search_index_list(client): diff --git a/tests/functional/services/search/test_reopen_index.py b/tests/functional/services/search/test_reopen_index.py index b5ef9a05a..8f6a034b9 100644 --- a/tests/functional/services/search/test_reopen_index.py +++ b/tests/functional/services/search/test_reopen_index.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_reopen_index(client): diff --git a/tests/functional/services/search/test_search.py b/tests/functional/services/search/test_search.py index 218f714a4..4e5f6f5d3 100644 --- a/tests/functional/services/search/test_search.py +++ b/tests/functional/services/search/test_search.py @@ -7,7 +7,7 @@ import globus_sdk from globus_sdk._missing import filter_missing -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response from tests.common import register_api_route_fixture_file diff --git a/tests/functional/services/search/test_search_roles.py b/tests/functional/services/search/test_search_roles.py index 55b151036..5efa4a80b 100644 --- a/tests/functional/services/search/test_search_roles.py +++ b/tests/functional/services/search/test_search_roles.py @@ -3,7 +3,7 @@ import pytest import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.fixture diff --git a/tests/functional/services/timers/test_create_timer.py b/tests/functional/services/timers/test_create_timer.py index a62909aaa..4167f704f 100644 --- a/tests/functional/services/timers/test_create_timer.py +++ b/tests/functional/services/timers/test_create_timer.py @@ -2,7 +2,7 @@ import globus_sdk from globus_sdk._missing import filter_missing -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_dummy_timer_creation(client): diff --git a/tests/functional/services/timers/test_jobs.py b/tests/functional/services/timers/test_jobs.py index 54160d7e5..973385a0a 100644 --- a/tests/functional/services/timers/test_jobs.py +++ b/tests/functional/services/timers/test_jobs.py @@ -4,8 +4,8 @@ import pytest from globus_sdk import TimerJob, TimersAPIError, TransferData, config, exc -from globus_sdk._testing import get_last_request, load_response from globus_sdk._utils import slash_join +from globus_sdk.testing import get_last_request, load_response from tests.common import GO_EP1_ID, GO_EP2_ID diff --git a/tests/functional/services/transfer/endpoint_manager/test_endpoint_manager_task_successful_transfers.py b/tests/functional/services/transfer/endpoint_manager/test_endpoint_manager_task_successful_transfers.py index 528a2977c..113a7727e 100644 --- a/tests/functional/services/transfer/endpoint_manager/test_endpoint_manager_task_successful_transfers.py +++ b/tests/functional/services/transfer/endpoint_manager/test_endpoint_manager_task_successful_transfers.py @@ -1,4 +1,4 @@ -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_endpoint_manager_task_successful_transfers(client): diff --git a/tests/functional/services/transfer/endpoint_manager/test_task_event_list.py b/tests/functional/services/transfer/endpoint_manager/test_task_event_list.py index d6042cd6e..a4158f4db 100644 --- a/tests/functional/services/transfer/endpoint_manager/test_task_event_list.py +++ b/tests/functional/services/transfer/endpoint_manager/test_task_event_list.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import get_last_request +from globus_sdk.testing import get_last_request from tests.common import register_api_route ZERO_ID = uuid.UUID(int=0) diff --git a/tests/functional/services/transfer/endpoint_manager/test_task_list.py b/tests/functional/services/transfer/endpoint_manager/test_task_list.py index f86a46ddb..fb458ae7d 100644 --- a/tests/functional/services/transfer/endpoint_manager/test_task_list.py +++ b/tests/functional/services/transfer/endpoint_manager/test_task_list.py @@ -4,7 +4,7 @@ import pytest import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response ZERO_ID = uuid.UUID(int=0) diff --git a/tests/functional/services/transfer/test_operation_ls.py b/tests/functional/services/transfer/test_operation_ls.py index 68f3107e3..d9ec532a9 100644 --- a/tests/functional/services/transfer/test_operation_ls.py +++ b/tests/functional/services/transfer/test_operation_ls.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import RegisteredResponse, get_last_request, load_response +from globus_sdk.testing import RegisteredResponse, get_last_request, load_response from tests.common import GO_EP1_ID diff --git a/tests/functional/services/transfer/test_operation_mkdir.py b/tests/functional/services/transfer/test_operation_mkdir.py index 844dadeca..e9111acb8 100644 --- a/tests/functional/services/transfer/test_operation_mkdir.py +++ b/tests/functional/services/transfer/test_operation_mkdir.py @@ -4,7 +4,7 @@ import pytest from globus_sdk import MISSING -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response _OMIT = object() diff --git a/tests/functional/services/transfer/test_operation_rename.py b/tests/functional/services/transfer/test_operation_rename.py index 981593320..e4e59e0d4 100644 --- a/tests/functional/services/transfer/test_operation_rename.py +++ b/tests/functional/services/transfer/test_operation_rename.py @@ -4,7 +4,7 @@ import pytest from globus_sdk import MISSING -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response _OMIT = object() diff --git a/tests/functional/services/transfer/test_operation_stat.py b/tests/functional/services/transfer/test_operation_stat.py index 479a7af1a..3a0588a3d 100644 --- a/tests/functional/services/transfer/test_operation_stat.py +++ b/tests/functional/services/transfer/test_operation_stat.py @@ -4,7 +4,7 @@ import urllib.parse -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response def test_operation_stat(client): diff --git a/tests/functional/services/transfer/test_operation_symlink.py b/tests/functional/services/transfer/test_operation_symlink.py index de85f72d1..6cda727fa 100644 --- a/tests/functional/services/transfer/test_operation_symlink.py +++ b/tests/functional/services/transfer/test_operation_symlink.py @@ -3,7 +3,7 @@ import pytest from globus_sdk import exc -from globus_sdk._testing import RegisteredResponse +from globus_sdk.testing import RegisteredResponse @pytest.fixture diff --git a/tests/functional/services/transfer/test_set_subscription_admin_verified.py b/tests/functional/services/transfer/test_set_subscription_admin_verified.py index 033f86071..5e741e67f 100644 --- a/tests/functional/services/transfer/test_set_subscription_admin_verified.py +++ b/tests/functional/services/transfer/test_set_subscription_admin_verified.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_set_subscription_admin_verified(client): diff --git a/tests/functional/services/transfer/test_set_subscription_id.py b/tests/functional/services/transfer/test_set_subscription_id.py index 2676baa82..201431a49 100644 --- a/tests/functional/services/transfer/test_set_subscription_id.py +++ b/tests/functional/services/transfer/test_set_subscription_id.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_set_subscription_id(client): diff --git a/tests/functional/services/transfer/test_simple.py b/tests/functional/services/transfer/test_simple.py index a280e3799..ce670db3a 100644 --- a/tests/functional/services/transfer/test_simple.py +++ b/tests/functional/services/transfer/test_simple.py @@ -5,7 +5,7 @@ import pytest import globus_sdk -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response from tests.common import GO_EP1_ID, register_api_route_fixture_file diff --git a/tests/functional/services/transfer/test_task_list.py b/tests/functional/services/transfer/test_task_list.py index c066c60a1..09d9fdaa4 100644 --- a/tests/functional/services/transfer/test_task_list.py +++ b/tests/functional/services/transfer/test_task_list.py @@ -2,7 +2,7 @@ import pytest -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.mark.parametrize( diff --git a/tests/functional/services/transfer/test_task_submit.py b/tests/functional/services/transfer/test_task_submit.py index 822ad0b5b..a6a7c788d 100644 --- a/tests/functional/services/transfer/test_task_submit.py +++ b/tests/functional/services/transfer/test_task_submit.py @@ -7,7 +7,7 @@ import pytest from globus_sdk import DeleteData, TransferAPIError, TransferData -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response from tests.common import GO_EP1_ID, GO_EP2_ID diff --git a/tests/functional/services/transfer/test_task_wait.py b/tests/functional/services/transfer/test_task_wait.py index 61099a4c4..05b9d0045 100644 --- a/tests/functional/services/transfer/test_task_wait.py +++ b/tests/functional/services/transfer/test_task_wait.py @@ -4,7 +4,7 @@ import responses import globus_sdk -from globus_sdk._testing import get_last_request +from globus_sdk.testing import get_last_request from tests.common import register_api_route_fixture_file TASK1_ID = "b8872740-7edc-11ec-9f33-ed182a728dff" diff --git a/tests/functional/_testing/test_non_default_mock.py b/tests/functional/testing/test_non_default_mock.py similarity index 91% rename from tests/functional/_testing/test_non_default_mock.py rename to tests/functional/testing/test_non_default_mock.py index 7267e2c48..52a527e5a 100644 --- a/tests/functional/_testing/test_non_default_mock.py +++ b/tests/functional/testing/test_non_default_mock.py @@ -1,5 +1,5 @@ """ -Test that globus_sdk._testing can accept a non-default requests mock +Test that globus_sdk.testing can accept a non-default requests mock """ import sys @@ -9,7 +9,7 @@ import responses from globus_sdk import GlobusHTTPResponse, GroupsClient -from globus_sdk._testing import get_last_request, load_response +from globus_sdk.testing import get_last_request, load_response @pytest.fixture diff --git a/tests/functional/tokenstorage/v2/conftest.py b/tests/functional/tokenstorage/v2/conftest.py index f00823c35..ed7acb4e9 100644 --- a/tests/functional/tokenstorage/v2/conftest.py +++ b/tests/functional/tokenstorage/v2/conftest.py @@ -5,7 +5,7 @@ import pytest import globus_sdk -from globus_sdk._testing import RegisteredResponse +from globus_sdk.testing import RegisteredResponse from globus_sdk.token_storage import TokenStorageData diff --git a/tests/unit/errors/test_auth_errors.py b/tests/unit/errors/test_auth_errors.py index 0103a2feb..7a8ae060f 100644 --- a/tests/unit/errors/test_auth_errors.py +++ b/tests/unit/errors/test_auth_errors.py @@ -1,7 +1,7 @@ import pytest from globus_sdk import AuthAPIError -from globus_sdk._testing import construct_error +from globus_sdk.testing import construct_error def test_auth_error_get_args_simple(): diff --git a/tests/unit/errors/test_common_functionality.py b/tests/unit/errors/test_common_functionality.py index 95997229e..dff25e365 100644 --- a/tests/unit/errors/test_common_functionality.py +++ b/tests/unit/errors/test_common_functionality.py @@ -4,7 +4,7 @@ import requests from globus_sdk import ErrorSubdocument, GlobusAPIError, RemovedInV4Warning, exc -from globus_sdk._testing import construct_error +from globus_sdk.testing import construct_error def _strmatch_any_order(inputstr, prefix, midfixes, suffix, sep=", "): diff --git a/tests/unit/errors/test_timers_errors.py b/tests/unit/errors/test_timers_errors.py index 5125d495a..99b0e1ca8 100644 --- a/tests/unit/errors/test_timers_errors.py +++ b/tests/unit/errors/test_timers_errors.py @@ -1,5 +1,5 @@ from globus_sdk import TimersAPIError -from globus_sdk._testing import construct_error +from globus_sdk.testing import construct_error def test_timer_error_load_simple(): diff --git a/tests/unit/errors/test_transfer_errors.py b/tests/unit/errors/test_transfer_errors.py index b88291d2a..5e621acfa 100644 --- a/tests/unit/errors/test_transfer_errors.py +++ b/tests/unit/errors/test_transfer_errors.py @@ -1,5 +1,5 @@ from globus_sdk import TransferAPIError -from globus_sdk._testing import construct_error +from globus_sdk.testing import construct_error def test_transfer_response_get_args(): diff --git a/tests/unit/globus_app/test_client_integration.py b/tests/unit/globus_app/test_client_integration.py index e676eb5ec..236713c4d 100644 --- a/tests/unit/globus_app/test_client_integration.py +++ b/tests/unit/globus_app/test_client_integration.py @@ -4,7 +4,7 @@ import globus_sdk from globus_sdk import GlobusApp, GlobusAppConfig, UserApp -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response from globus_sdk.token_storage import MemoryTokenStorage diff --git a/tests/unit/globus_app/test_globus_app.py b/tests/unit/globus_app/test_globus_app.py index 7149871ac..db0672feb 100644 --- a/tests/unit/globus_app/test_globus_app.py +++ b/tests/unit/globus_app/test_globus_app.py @@ -19,7 +19,6 @@ TransferClient, UserApp, ) -from globus_sdk._testing import load_response from globus_sdk.exc import GlobusSDKUsageError from globus_sdk.gare import GlobusAuthorizationParameters from globus_sdk.globus_app.authorizer_factory import ( @@ -33,6 +32,7 @@ LoginFlowManager, ) from globus_sdk.scopes import AuthScopes, Scope +from globus_sdk.testing import load_response from globus_sdk.token_storage import ( HasRefreshTokensValidator, JSONTokenStorage, diff --git a/tests/unit/sphinxext/test_expand_testing_fixture.py b/tests/unit/sphinxext/test_expand_testing_fixture.py index 15311c9aa..46de311f9 100644 --- a/tests/unit/sphinxext/test_expand_testing_fixture.py +++ b/tests/unit/sphinxext/test_expand_testing_fixture.py @@ -20,7 +20,7 @@ def test_expand_testing_fixture_fails_on_bad_reference(sphinx_runner, capsys): pytest.fail("Didn't find 'ValueError: no fixtures defined' in stderr") assert ( - "no fixtures defined for globus_sdk._testing.data.NO_SUCH_FIXTURE" in test_line + "no fixtures defined for globus_sdk.testing.data.NO_SUCH_FIXTURE" in test_line ) diff --git a/tests/unit/test_auth_requirements_error.py b/tests/unit/test_auth_requirements_error.py index 0ec203a92..345f57c9f 100644 --- a/tests/unit/test_auth_requirements_error.py +++ b/tests/unit/test_auth_requirements_error.py @@ -2,7 +2,6 @@ import pytest -from globus_sdk._testing import construct_error from globus_sdk.exc import ErrorSubdocument from globus_sdk.gare import ( GARE, @@ -13,6 +12,7 @@ to_gare, to_gares, ) +from globus_sdk.testing import construct_error @pytest.mark.parametrize( diff --git a/tests/unit/test_base_client.py b/tests/unit/test_base_client.py index 0b08f689c..df1abcd5e 100644 --- a/tests/unit/test_base_client.py +++ b/tests/unit/test_base_client.py @@ -7,9 +7,9 @@ import globus_sdk from globus_sdk import GlobusApp, GlobusAppConfig, GlobusSDKUsageError, UserApp -from globus_sdk._testing import RegisteredResponse, get_last_request from globus_sdk.authorizers import NullAuthorizer from globus_sdk.scopes import Scope, TransferScopes +from globus_sdk.testing import RegisteredResponse, get_last_request from globus_sdk.token_storage import TokenValidationError diff --git a/tests/unit/test_gcs_client.py b/tests/unit/test_gcs_client.py index e48976592..356c9f73c 100644 --- a/tests/unit/test_gcs_client.py +++ b/tests/unit/test_gcs_client.py @@ -1,5 +1,5 @@ from globus_sdk import GCSClient -from globus_sdk._testing import load_response +from globus_sdk.testing import load_response def test_client_address_handling(): diff --git a/tests/unit/_testing/test_construct_error.py b/tests/unit/testing/test_construct_error.py similarity index 97% rename from tests/unit/_testing/test_construct_error.py rename to tests/unit/testing/test_construct_error.py index 9a976936e..203392a3a 100644 --- a/tests/unit/_testing/test_construct_error.py +++ b/tests/unit/testing/test_construct_error.py @@ -1,7 +1,7 @@ import pytest import globus_sdk -from globus_sdk._testing import construct_error +from globus_sdk.testing import construct_error def test_construct_error_defaults_to_base_error_class(): diff --git a/tests/unit/_testing/test_registered_response.py b/tests/unit/testing/test_registered_response.py similarity index 91% rename from tests/unit/_testing/test_registered_response.py rename to tests/unit/testing/test_registered_response.py index 11837e6d9..a0af10cb3 100644 --- a/tests/unit/_testing/test_registered_response.py +++ b/tests/unit/testing/test_registered_response.py @@ -4,7 +4,7 @@ import pytest -from globus_sdk._testing import RegisteredResponse +from globus_sdk.testing import RegisteredResponse @pytest.mark.skipif(