Fix test advanced 9

python/ray/includes/global_state_accessor.pxd

@@ -75,14 +75,9 @@ cdef extern from * namespace "ray::gcs" nogil:
  instrumented_io_context io_service;
 
  auto redis_client = std::make_shared<RedisClient>(options);
- try {
- auto status = redis_client->Connect(io_service);
- if(!status.ok()) {
- RAY_LOG(ERROR) << "Failed to connect to redis: " << status.ToString();
- return false;
- }
- } catch (std::exception& e) {
- RAY_LOG(ERROR) << "Failed to connect to redis: " << e.what();
+ auto status = redis_client->Connect(io_service);
+ if(!status.ok()) {
+ RAY_LOG(ERROR) << "Failed to connect to redis: " << status.ToString();
  return false;
  }
 

python/ray/tests/test_advanced_9.py

@@ -355,8 +355,9 @@ def check_demands(n):
 
 @pytest.mark.skipif(enable_external_redis(), reason="Only valid in non redis env")
 def test_redis_not_available(monkeypatch, call_ray_stop_only):
- monkeypatch.setenv("RAY_NUM_REDIS_GET_RETRIES", "2")
+ monkeypatch.setenv("RAY_redis_db_connect_retries", "5")
  monkeypatch.setenv("RAY_REDIS_ADDRESS", "localhost:12345")
+
  p = subprocess.run(
  "ray start --head",
  shell=True,
@@ -369,7 +370,7 @@ def test_redis_not_available(monkeypatch, call_ray_stop_only):
 
 @pytest.mark.skipif(not enable_external_redis(), reason="Only valid in redis env")
 def test_redis_wrong_password(monkeypatch, external_redis, call_ray_stop_only):
- monkeypatch.setenv("RAY_NUM_REDIS_GET_RETRIES", "2")
+ monkeypatch.setenv("RAY_redis_db_connect_retries", "5")
  p = subprocess.run(
  "ray start --head --redis-password=1234",
  shell=True,

python/ray/tests/test_gcs_fault_tolerance.py

@@ -955,8 +955,12 @@ def test_redis_logs(external_redis):
  ["ray", "start", "--head"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
  )
  stdout, stderr = process.communicate(timeout=30)
+ print(stdout.decode())
+ print(stderr.decode())
  assert "redis_context.cc" not in stderr.decode()
+ assert "redis_context.cc" not in stdout.decode()
  assert "Resolve Redis address" not in stderr.decode()
+ assert "Resolve Redis address" not in stdout.decode()
  # assert "redis_context.cc" not in result.output
  finally:
  from click.testing import CliRunner