Skip to content

Commit

Permalink
[hotfix] Fix pytest dependency in test_utils (ray-project#27956)
Browse files Browse the repository at this point in the history
import pytest in test_utils breaks a bunch of test.
  • Loading branch information
scv119 authored and JiahaoYao committed Aug 22, 2022
1 parent 6a5a11a commit f08a806
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion dashboard/modules/snapshot/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from ray._private.test_utils import set_override_dashboard_url # noqa: F401
from ray._private.conftest_utils import set_override_dashboard_url # noqa: F401
14 changes: 14 additions & 0 deletions python/ray/_private/conftest_utils.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import pytest
import ray._private.ray_constants as ray_constants


@pytest.fixture
def set_override_dashboard_url(monkeypatch, request):
override_url = getattr(request, "param", "https://external_dashboard_url")
with monkeypatch.context() as m:
if override_url:
m.setenv(
ray_constants.RAY_OVERRIDE_DASHBOARD_URL,
override_url,
)
yield
14 changes: 0 additions & 14 deletions python/ray/_private/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
import grpc
import numpy as np
import psutil # We must import psutil after ray because we bundle it with ray.
import pytest
import yaml
from grpc._channel import _InactiveRpcError

import ray
import ray._private.gcs_utils as gcs_utils
import ray._private.memory_monitor as memory_monitor
import ray._private.ray_constants as ray_constants
import ray._private.services
import ray._private.utils
from ray._private.gcs_pubsub import GcsErrorSubscriber, GcsLogSubscriber
Expand All @@ -48,18 +46,6 @@ def text_string_to_metric_families(*args, **kwargs):
raise ModuleNotFoundError("`prometheus_client` not found")


@pytest.fixture
def set_override_dashboard_url(monkeypatch, request):
override_url = getattr(request, "param", "https://external_dashboard_url")
with monkeypatch.context() as m:
if override_url:
m.setenv(
ray_constants.RAY_OVERRIDE_DASHBOARD_URL,
override_url,
)
yield


class RayTestTimeoutException(Exception):
"""Exception used to identify timeouts from test utilities."""

Expand Down
4 changes: 2 additions & 2 deletions python/ray/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
import ray
import ray._private.ray_constants as ray_constants
import ray.util.client.server.server as ray_client_server
from ray._private.conftest_utils import set_override_dashboard_url # noqa: F401
from ray._private.runtime_env.pip import PipProcessor
from ray._private.runtime_env.plugin_schema_manager import RuntimeEnvPluginSchemaManager
from ray._private.services import (
REDIS_EXECUTABLE,
_start_redis_instance,
)
from ray._private.test_utils import ( # noqa: F401
from ray._private.test_utils import (
get_and_run_node_killer,
init_error_pubsub,
init_log_pubsub,
set_override_dashboard_url,
setup_tls,
teardown_tls,
enable_external_redis,
Expand Down

0 comments on commit f08a806

Please sign in to comment.