Skip to content

Commit

Permalink
Revert "fix some tests."
Browse files Browse the repository at this point in the history
This reverts commit 01e492a.
  • Loading branch information
rkooo567 committed Sep 1, 2023
1 parent e32d538 commit 0e73a7e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 7 deletions.
3 changes: 1 addition & 2 deletions python/ray/_private/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ def __init__(
if head and storage_namespace is None:
raise ValueError(
"RAY_external_storage_namespace must be provided "
"when using Ray with external Redis via `RAY_REDIS_ADDRESS` "
" for the fault tolerance. "
"when using Ray with external Redis for the fault tolerance. "
"RAY_external_storage_namespace must be an unique ID "
"and has to be the same across the same head node."
)
Expand Down
2 changes: 0 additions & 2 deletions python/ray/tests/test_advanced_9.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import sys
import time
import uuid

import pytest

Expand Down Expand Up @@ -358,7 +357,6 @@ def check_demands(n):
def test_redis_not_available(monkeypatch, call_ray_stop_only):
monkeypatch.setenv("RAY_NUM_REDIS_GET_RETRIES", "2")
monkeypatch.setenv("RAY_REDIS_ADDRESS", "localhost:12345")
monkeypatch.setenv("RAY_external_storage_namespace", str(uuid.uuid4()))
p = subprocess.run(
"ray start --head",
shell=True,
Expand Down
3 changes: 0 additions & 3 deletions python/ray/tests/test_multi_node_3.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import os
import subprocess
import sys
import uuid
from pathlib import Path

import psutil
Expand Down Expand Up @@ -136,12 +135,10 @@ def test_calling_start_ray_head(call_ray_stop_only):
temp_dir, 8888, password=ray_constants.REDIS_DEFAULT_PASSWORD
)
os.environ["RAY_REDIS_ADDRESS"] = "127.0.0.1:8888"
os.environ["RAY_external_storage_namespace"] = str(uuid.uuid4())
check_call_ray(["start", "--head"])
check_call_ray(["stop"])
proc.process.terminate()
del os.environ["RAY_REDIS_ADDRESS"]
del os.environ["RAY_external_storage_namespace"]

# Test --block. Killing a child process should cause the command to exit.
blocked = subprocess.Popen(["ray", "start", "--head", "--block", "--port", "0"])
Expand Down

0 comments on commit 0e73a7e

Please sign in to comment.