Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions python/ray/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
import ray._private.ray_constants as ray_constants
from ray._common.network_utils import build_address, find_free_port
from ray._common.test_utils import wait_for_condition
from ray._private.authentication_test_utils import (
authentication_env_guard,
clear_auth_token_sources,
reset_auth_token_state,
set_auth_mode,
set_env_auth_token,
)
from ray._private.conftest_utils import set_override_dashboard_url # noqa: F401
from ray._private.runtime_env import virtualenv_utils
from ray._private.test_utils import (
Expand All @@ -42,13 +49,6 @@
teardown_tls,
)
from ray.cluster_utils import AutoscalingCluster, Cluster, cluster_not_supported
from ray.tests.authentication_test_utils import (
authentication_env_guard,
clear_auth_token_sources,
reset_auth_token_state,
set_auth_mode,
set_env_auth_token,
)

import psutil

Expand Down
4 changes: 2 additions & 2 deletions python/ray/tests/test_runtime_env_agent_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
format_authentication_http_error,
get_auth_headers_if_auth_enabled,
)
from ray.core.generated import runtime_env_agent_pb2
from ray.tests.authentication_test_utils import (
from ray._private.authentication_test_utils import (
reset_auth_token_state,
set_auth_mode,
set_env_auth_token,
)
from ray.core.generated import runtime_env_agent_pb2


def _agent_url(agent_address: str, path: str) -> str:
Expand Down
6 changes: 3 additions & 3 deletions python/ray/tests/test_submission_client_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
HTTP_REQUEST_INVALID_TOKEN_ERROR_MESSAGE,
HTTP_REQUEST_MISSING_TOKEN_ERROR_MESSAGE,
)
from ray.dashboard.modules.dashboard_sdk import SubmissionClient
from ray.dashboard.modules.job.sdk import JobSubmissionClient
from ray.tests.authentication_test_utils import (
from ray._private.authentication_test_utils import (
clear_auth_token_sources,
reset_auth_token_state,
set_auth_mode,
set_env_auth_token,
)
from ray.dashboard.modules.dashboard_sdk import SubmissionClient
from ray.dashboard.modules.job.sdk import JobSubmissionClient
from ray.util.state import StateApiClient


Expand Down
2 changes: 1 addition & 1 deletion python/ray/tests/test_token_auth_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
_RAYLET_AVAILABLE = False
AuthenticationTokenLoader = None

from ray.tests.authentication_test_utils import (
from ray._private.authentication_test_utils import (
clear_auth_token_sources,
reset_auth_token_state,
set_auth_mode,
Expand Down