From ef249c98b1324720b1e5d851cdf71995481983a0 Mon Sep 17 00:00:00 2001 From: Eric Liang Date: Thu, 18 Mar 2021 12:02:25 -0700 Subject: [PATCH] [flaky test] Fix test_cli by disabling config cache for dashboard test (#14755) --- python/ray/scripts/scripts.py | 11 +++++++++-- python/ray/tests/test_cli.py | 3 ++- .../tests/test_cli_patterns/test_ray_dashboard.txt | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/python/ray/scripts/scripts.py b/python/ray/scripts/scripts.py index 2d0f2c901..cfd7212db 100644 --- a/python/ray/scripts/scripts.py +++ b/python/ray/scripts/scripts.py @@ -130,7 +130,13 @@ def cli(logging_level, logging_format): type=int, default=ray_constants.DEFAULT_DASHBOARD_PORT, help="The remote port your dashboard runs on") -def dashboard(cluster_config_file, cluster_name, port, remote_port): +@click.option( + "--no-config-cache", + is_flag=True, + default=False, + help="Disable the local cluster config cache.") +def dashboard(cluster_config_file, cluster_name, port, remote_port, + no_config_cache): """Port-forward a Ray cluster's dashboard to the local machine.""" # Sleeping in a loop is preferable to `sleep infinity` because the latter # only works on linux. @@ -147,7 +153,8 @@ def dashboard(cluster_config_file, cluster_name, port, remote_port): exec_cluster( cluster_config_file, override_cluster_name=cluster_name, - port_forward=port_forward) + port_forward=port_forward, + no_config_cache=no_config_cache) click.echo("Successfully established connection.") except Exception as e: raise click.ClickException( diff --git a/python/ray/tests/test_cli.py b/python/ray/tests/test_cli.py index 9e235e1b3..114072a12 100644 --- a/python/ray/tests/test_cli.py +++ b/python/ray/tests/test_cli.py @@ -352,7 +352,8 @@ def test_ray_dashboard(configure_lang, configure_aws, _unlink_test_ssh_key): ]) _die_on_error(result) - result = runner.invoke(scripts.dashboard, [DEFAULT_TEST_CONFIG_PATH]) + result = runner.invoke(scripts.dashboard, + [DEFAULT_TEST_CONFIG_PATH, "--no-config-cache"]) _check_output_via_pattern("test_ray_dashboard.txt", result) diff --git a/python/ray/tests/test_cli_patterns/test_ray_dashboard.txt b/python/ray/tests/test_cli_patterns/test_ray_dashboard.txt index 3f7aaf070..fdc94d006 100644 --- a/python/ray/tests/test_cli_patterns/test_ray_dashboard.txt +++ b/python/ray/tests/test_cli_patterns/test_ray_dashboard.txt @@ -1,6 +1,5 @@ Attempting to establish dashboard locally at localhost:8265 connected to remote port 8265 -Loaded cached provider configuration -If you experience issues with the cloud provider, try re-running the command with --no-config-cache. +Checking AWS environment settings Fetched IP: .+ Forwarding ports ubuntu@ip-.+:~\$ exit