From 2cdb76789e6d0d59928891a4b520f588b7844edf Mon Sep 17 00:00:00 2001 From: Riatre <4597732+Riatre@users.noreply.github.com> Date: Wed, 13 Jul 2022 12:14:35 +0800 Subject: [PATCH] Bump pytest from 5.4.3 to 7.0.1 (#26334) See #23676 for context. This is another attempt at that as I figured out what's going wrong in `bazel test`. Supersedes #24828. Now that there are Python 3.10 wheels for Ray 1.13 and this is no longer a blocker for supporting Python 3.10, I still want to make `bazel test //python/ray/tests/...` work for developing in a 3.10 env, and make it easier to add Python 3.10 tests to CI in future. The change contains three commits with rather descriptive commit message, which I repeat here: Pass deps to py_test in py_test_module_list Bazel macro py_test_module_list takes a `deps` argument, but completely ignores it instead of passes it to `native.py_test`. Fixing that as we are going to use deps of py_test_module_list in BUILD in later changes. cpp/BUILD.bazel depends on the broken behaviour: it deps-on a cc_library from a py_test, which isn't working, see upstream issue: https://github.com/bazelbuild/bazel/issues/701. This is fixed by simply removing the (non-working) deps. Depend on conftest and data files in Python tests BUILD files Bazel requires that all the files used in a test run should be represented in the transitive dependencies specified for the test target. For py_test, it means srcs, deps and data. Bazel enforces this constraint by creating a "runfiles" directory, symbolic links files in the dependency closure and run the test in the "runfiles" directory, so that the test shouldn't see files not in the dependency graph. Unfortunately, the constraint does not apply for a large number of Python tests, due to pytest (>=3.9.0, <6.0) resolving these symbolic links during test collection and effectively "breaks out" of the runfiles tree. pytest >= 6.0 introduces a breaking change and removed the symbolic link resolving behaviour, see pytest pull request https://github.com/pytest-dev/pytest/pull/6523 for more context. Currently, we are underspecifying dependencies in a lot of BUILD files and thus blocking us from updating to newer pytest (for Python 3.10 support). This change hopefully fixes all of them, and at least those in CI, by adding data or source dependencies (mostly for conftest.py-s) where needed. Bump pytest version from 5.4.3 to 7.0.1 We want at least pytest 6.2.5 for Python 3.10 support, but not past 7.1.0 since it drops Python 3.6 support (which Ray still supports), thus the version constraint is set to <7.1. Updating pytest, combined with earlier BUILD fixes, changed the ground truth of a few error message based unit test, these tests are updated to reflect the change. There are also two small drive-by changes for making test_traceback and test_cli pass under Python 3.10. These are discovered while debugging CI failures (on earlier Python) with a Python 3.10 install locally. Expect more such issues when adding Python 3.10 to CI. --- bazel/python.bzl | 3 +- ci/build/test-wheels.sh | 4 +- ci/env/install-minimal.sh | 4 +- cpp/BUILD.bazel | 4 +- dashboard/BUILD | 17 ++ python/ray/autoscaler/aws/BUILD | 5 + python/ray/autoscaler/azure/BUILD | 5 + python/ray/autoscaler/gcp/BUILD | 5 + python/ray/autoscaler/local/BUILD | 5 + python/ray/data/BUILD | 16 +- .../experimental/packaging/example_pkg/BUILD | 9 + python/ray/serve/BUILD | 6 + python/ray/tests/BUILD | 172 +++++++++++------- python/ray/tests/modin/BUILD | 2 +- python/ray/tests/test_autoscaler_yaml.py | 2 +- python/ray/tests/test_cli.py | 5 +- python/ray/tests/test_traceback.py | 32 ++-- python/ray/tests/test_tracing.py | 9 +- python/ray/tune/BUILD | 1 + python/ray/workflow/BUILD | 8 +- .../workflow/tests/test_basic_workflows_2.py | 3 +- python/requirements.txt | 2 +- release/BUILD | 13 +- 23 files changed, 214 insertions(+), 118 deletions(-) create mode 100644 python/ray/autoscaler/aws/BUILD create mode 100644 python/ray/autoscaler/azure/BUILD create mode 100644 python/ray/autoscaler/gcp/BUILD create mode 100644 python/ray/autoscaler/local/BUILD create mode 100644 python/ray/experimental/packaging/example_pkg/BUILD diff --git a/bazel/python.bzl b/bazel/python.bzl index 4f1e49604..d0afefa3d 100644 --- a/bazel/python.bzl +++ b/bazel/python.bzl @@ -3,7 +3,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths") # py_test_module_list creates a py_test target for each # Python file in `files` -def py_test_module_list(files, size, deps, extra_srcs, name_suffix="", **kwargs): +def py_test_module_list(files, size, deps, extra_srcs=[], name_suffix="", **kwargs): for file in files: # remove .py name = paths.split_extension(file)[0] + name_suffix @@ -14,6 +14,7 @@ def py_test_module_list(files, size, deps, extra_srcs, name_suffix="", **kwargs) size = size, main = file, srcs = extra_srcs + [file], + deps = deps, **kwargs ) diff --git a/ci/build/test-wheels.sh b/ci/build/test-wheels.sh index 6d9660829..60543427e 100755 --- a/ci/build/test-wheels.sh +++ b/ci/build/test-wheels.sh @@ -76,7 +76,7 @@ if [[ "$platform" == "linux" ]]; then "$PYTHON_EXE" -u -c "import ray; print(ray.__commit__)" | grep "$TRAVIS_COMMIT" || (echo "ray.__commit__ not set properly!" && exit 1) # Install the dependencies to run the tests. - "$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==5.4.3 requests proxy.py + "$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio 'pytest==7.0.1' requests proxy.py # Run a simple test script to make sure that the wheel works. for SCRIPT in "${TEST_SCRIPTS[@]}"; do @@ -117,7 +117,7 @@ elif [[ "$platform" == "macosx" ]]; then "$PIP_CMD" install -q "$PYTHON_WHEEL" # Install the dependencies to run the tests. - "$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==5.4.3 requests proxy.py + "$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio 'pytest==7.0.1' requests proxy.py # Run a simple test script to make sure that the wheel works. for SCRIPT in "${TEST_SCRIPTS[@]}"; do diff --git a/ci/env/install-minimal.sh b/ci/env/install-minimal.sh index 5670a86eb..493bd841c 100755 --- a/ci/env/install-minimal.sh +++ b/ci/env/install-minimal.sh @@ -33,11 +33,11 @@ eval "${WORKSPACE_DIR}/ci/ci.sh build" # Install test requirements python -m pip install -U \ - pytest==5.4.3 \ + pytest==7.0.1 \ numpy # Train requirements. # TODO: make this dynamic if [ "${TRAIN_MINIMAL_INSTALL-}" = 1 ]; then python -m pip install -U "ray[tune]" -fi \ No newline at end of file +fi diff --git a/cpp/BUILD.bazel b/cpp/BUILD.bazel index a62245857..8a8e4efc0 100644 --- a/cpp/BUILD.bazel +++ b/cpp/BUILD.bazel @@ -324,7 +324,5 @@ py_test_module_list( "small_size_python_tests", "team:core", ], - deps = [ - ":ray_api", - ], + deps = [], ) diff --git a/dashboard/BUILD b/dashboard/BUILD index 467dd091a..5443b4398 100644 --- a/dashboard/BUILD +++ b/dashboard/BUILD @@ -10,11 +10,26 @@ py_library( ), ) +py_library( + name = "conftest", + srcs = ["tests/conftest.py"], + deps = ["//python/ray/tests:conftest"], +) + py_test_run_all_subdirectory( size = "medium", include = ["**/test*.py"], exclude = ["modules/test/**", "modules/node/tests/test_node.py", "tests/test_dashboard.py"], extra_srcs = [], + data = [ + "modules/job/tests/backwards_compatibility_scripts/test_backwards_compatibility.sh", + "modules/job/tests/pip_install_test-0.5-py3-none-any.whl", + "modules/snapshot/snapshot_schema.json", + "modules/tests/test_config_files/basic_runtime_env.yaml", + ] + glob([ + "modules/job/tests/subprocess_driver_scripts/*.py", + ]), + deps = [":conftest"], tags = ["exclusive", "team:serve"], ) @@ -22,6 +37,7 @@ py_test( name = "test_node", size = "medium", srcs = ["modules/node/tests/test_node.py"], + deps = [":conftest"], tags = ["exclusive", "team:serve"], ) @@ -29,5 +45,6 @@ py_test( name = "test_dashboard", size = "medium", srcs = ["tests/test_dashboard.py"], + deps = [":conftest"], tags = ["exclusive", "team:serve"], ) diff --git a/python/ray/autoscaler/aws/BUILD b/python/ray/autoscaler/aws/BUILD new file mode 100644 index 000000000..4e733cfe2 --- /dev/null +++ b/python/ray/autoscaler/aws/BUILD @@ -0,0 +1,5 @@ +filegroup( + name = "example", + data = glob(["example-*.yaml"]), + visibility = ["//python/ray/tests:__pkg__"], +) diff --git a/python/ray/autoscaler/azure/BUILD b/python/ray/autoscaler/azure/BUILD new file mode 100644 index 000000000..4e733cfe2 --- /dev/null +++ b/python/ray/autoscaler/azure/BUILD @@ -0,0 +1,5 @@ +filegroup( + name = "example", + data = glob(["example-*.yaml"]), + visibility = ["//python/ray/tests:__pkg__"], +) diff --git a/python/ray/autoscaler/gcp/BUILD b/python/ray/autoscaler/gcp/BUILD new file mode 100644 index 000000000..4e733cfe2 --- /dev/null +++ b/python/ray/autoscaler/gcp/BUILD @@ -0,0 +1,5 @@ +filegroup( + name = "example", + data = glob(["example-*.yaml"]), + visibility = ["//python/ray/tests:__pkg__"], +) diff --git a/python/ray/autoscaler/local/BUILD b/python/ray/autoscaler/local/BUILD new file mode 100644 index 000000000..4e733cfe2 --- /dev/null +++ b/python/ray/autoscaler/local/BUILD @@ -0,0 +1,5 @@ +filegroup( + name = "example", + data = glob(["example-*.yaml"]), + visibility = ["//python/ray/tests:__pkg__"], +) diff --git a/python/ray/data/BUILD b/python/ray/data/BUILD index 907551896..3cf35dfc4 100644 --- a/python/ray/data/BUILD +++ b/python/ray/data/BUILD @@ -5,19 +5,18 @@ # -------------------------------------------------------------------- load("//bazel:python.bzl", "py_test_module_list") -SRCS = [] + select({ - "@bazel_tools//src/conditions:windows": glob([ - "**/conftest.py", - ]), - "//conditions:default": [], -}) +py_library( + name = "conftest", + srcs = ["tests/conftest.py"], + deps = ["//python/ray/tests:conftest"], +) py_test( name = "test_preprocessors", size = "small", srcs = ["tests/test_preprocessors.py"], tags = ["team:ml", "exclusive", "ray_air"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -26,7 +25,6 @@ py_test_module_list( exclude=["tests/test_preprocessors.py"] ), size = "large", - extra_srcs = SRCS, tags = ["team:core", "exclusive"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) diff --git a/python/ray/experimental/packaging/example_pkg/BUILD b/python/ray/experimental/packaging/example_pkg/BUILD new file mode 100644 index 000000000..8e0160678 --- /dev/null +++ b/python/ray/experimental/packaging/example_pkg/BUILD @@ -0,0 +1,9 @@ +filegroup( + name = "example_pkg", + data = [ + "ray_pkg.yaml", + ] + glob([ + "my_pkg/**/*.py", + ]), + visibility = ["//python/ray/tests:__pkg__"], +) diff --git a/python/ray/serve/BUILD b/python/ray/serve/BUILD index ace3e6340..de2ceea08 100644 --- a/python/ray/serve/BUILD +++ b/python/ray/serve/BUILD @@ -12,6 +12,11 @@ py_library( serve_tests_srcs = glob(["tests/**/*.py"]) +filegroup( + name = "test_config_files", + data = glob(["tests/test_config_files/**/*"]), +) + py_test( name = "test_api", size = "medium", @@ -313,6 +318,7 @@ py_test( srcs = serve_tests_srcs, tags = ["exclusive", "team:serve"], deps = [":serve_lib"], + data = [":test_config_files"], ) py_test( diff --git a/python/ray/tests/BUILD b/python/ray/tests/BUILD index 9a8bb02c3..f51de0cb2 100644 --- a/python/ray/tests/BUILD +++ b/python/ray/tests/BUILD @@ -1,23 +1,31 @@ load("//bazel:python.bzl", "py_test_module_list") -SRCS = [] + select({ - "@bazel_tools//src/conditions:windows": glob([ - # TODO(mehrdadn): This should be added for all platforms once resulting errors are fixed - "**/conftest.py", - ]), - "//conditions:default": [], -}) +py_library( + name = "conftest", + srcs = glob(["**/conftest.py"]), + visibility = [ + "//python/ray/tests:__subpackages__", + "//python/ray/dashboard:__pkg__", + "//python/ray/data:__pkg__", + ], +) py_test_module_list( files = [ "test_dashboard.py", "test_ray_cluster_with_external_redis.py", - "test_k8s_cluster_launcher.py", ], size = "large", - extra_srcs = SRCS, tags = ["exclusive", "manual", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], +) + +py_test( + name = "test_k8s_cluster_launcher", + srcs = ["test_k8s_cluster_launcher.py"], + tags = ["exclusive", "manual", "team:serverless"], + deps = ["//:ray_lib", ":conftest"], + data = ["test_cli_patterns/test_k8s_cluster_launcher.yaml"] ) py_test_module_list( @@ -55,7 +63,6 @@ py_test_module_list( "test_grpc_client_credentials.py", "test_iter.py", "test_job.py", - "test_joblib.py", "test_get_locations.py", "test_global_state.py", "test_healthcheck.py", @@ -64,9 +71,17 @@ py_test_module_list( "test_protobuf_compatibility.py" ], size = "medium", - extra_srcs = SRCS, - tags = ["exclusive", "medium_size_python_tests_a_to_j", "team:core"], - deps = ["//:ray_lib"], + tags = ["exclusive", "client_tests", "team:serverless"], + deps = ["//:ray_lib", ":conftest"], +) + +py_test( + name = "test_joblib", + srcs = ["test_joblib.py"], + data = ["mnist_784_100_samples.pkl"], + size = "medium", + tags = ["exclusive", "client_tests", "team:serverless"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -75,9 +90,8 @@ py_test_module_list( "test_client_reconnect.py", ], size = "large", - extra_srcs = SRCS, tags = ["exclusive", "client_tests", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -92,9 +106,8 @@ py_test_module_list( "test_client_library_integration.py", ], size = "medium", - extra_srcs = SRCS, tags = ["exclusive", "client_tests", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -144,9 +157,8 @@ py_test_module_list( "test_traceback.py", ], size = "medium", - extra_srcs = SRCS, tags = ["exclusive", "medium_size_python_tests_k_to_z", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -179,9 +191,8 @@ py_test_module_list( "test_get_or_create_actor.py", ], size = "small", - extra_srcs = SRCS, tags = ["exclusive", "small_size_python_tests", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -189,9 +200,8 @@ py_test_module_list( "test_gcs_ha_e2e.py", ], size = "small", - extra_srcs = SRCS, tags = ["exclusive", "ray_ha", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) @@ -200,7 +210,6 @@ py_test_module_list( "test_autoscaler.py", "test_autoscaler_drain_node_api.py", "test_autoscaler_gcp.py", - "test_autoscaler_yaml.py", "test_cli_logger.py", "test_client_metadata.py", "test_client_terminate.py", @@ -212,9 +221,26 @@ py_test_module_list( "kuberay/test_autoscaling_config.py" ], size = "small", - extra_srcs = SRCS, tags = ["exclusive", "small_size_python_tests", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], +) + +py_test( + name = "test_autoscaler_yaml", + size = "small", + srcs = ["test_autoscaler_yaml.py"], + tags = ["exclusive", "small_size_python_tests", "team:serverless"], + deps = ["//:ray_lib", ":conftest"], + data = [ + "additional_property.yaml", + "test_cli_patterns/test_multi_node.yaml", + "test_cli_patterns/test_no_head.yaml", + "test_cli_patterns/test_no_workers.yaml", + "//python/ray/autoscaler/aws:example", + "//python/ray/autoscaler/azure:example", + "//python/ray/autoscaler/gcp:example", + "//python/ray/autoscaler/local:example", + ], ) py_test_module_list( @@ -222,15 +248,13 @@ py_test_module_list( "test_dataclient_disconnect.py", ], size = "medium", - extra_srcs = SRCS, tags = ["exclusive", "medium_size_python_tests_a_to_j", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( files = [ "test_actor.py", - "test_cli.py", "test_failure.py", "test_actor_advanced.py", "test_threaded_actor.py", @@ -244,9 +268,17 @@ py_test_module_list( "test_exit_observability.py", ], size = "large", - extra_srcs = SRCS, tags = ["exclusive", "large_size_python_tests_shard_0", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], +) + +py_test( + name = "test_cli", + srcs = ["test_cli.py"], + data = glob(["test_cli_patterns/*.txt", "test_cli_patterns/*.yaml"]), + size = "large", + tags = ["exclusive", "large_size_python_tests_shard_0", "team:core"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -265,9 +297,8 @@ py_test_module_list( "test_multi_node_3.py", ], size = "large", - extra_srcs = SRCS, tags = ["exclusive", "large_size_python_tests_shard_1", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -280,9 +311,9 @@ py_test_module_list( "test_runtime_env_working_dir_remote_uri.py" ], size = "large", - extra_srcs = SRCS, tags = ["exclusive", "large_size_python_tests_shard_2", "team:serve"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], + data = ["pip_install_test-0.5-py3-none-any.whl"], ) py_test_module_list( @@ -292,20 +323,27 @@ py_test_module_list( "test_runtime_env_conda_and_pip_3.py", "test_runtime_env_conda_and_pip_4.py", "test_runtime_env_conda_and_pip_5.py", - "test_runtime_env_complicated.py" ], size = "large", - extra_srcs = SRCS, tags = ["exclusive", "post_wheel_build", "team:serve"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], +) + +py_test( + name = "test_runtime_env_complicated", + size = "large", + srcs = ["test_runtime_env_complicated.py"], + tags = ["exclusive", "post_wheel_build", "team:serve"], + deps = ["//:ray_lib", ":conftest"], + data = ["//python/ray/experimental/packaging/example_pkg"], ) py_test( name = "test_actor_group", size = "medium", - srcs = SRCS + ["test_actor_group.py"], + srcs = ["test_actor_group.py"], tags = ["exclusive", "medium_size_python_tests_a_to_j", "team:serve"], - deps = ["//:ray_lib"] + deps = ["//:ray_lib", ":conftest"] ) # TODO(barakmich): aws/ might want its own buildfile, or @@ -313,25 +351,25 @@ py_test( py_test( name = "test_autoscaler_aws", size = "small", - srcs = SRCS + ["aws/test_autoscaler_aws.py"], + srcs = ["aws/test_autoscaler_aws.py"], tags = ["exclusive", "small_size_python_tests", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test( name = "test_aws_batch_tag_update", size = "small", - srcs = SRCS + ["aws/test_aws_batch_tag_update.py"], + srcs = ["aws/test_aws_batch_tag_update.py"], tags = ["exclusive", "small_size_python_tests", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test( name = "test_gcp_node_provider", size = "small", - srcs = SRCS + ["gcp/test_gcp_node_provider.py"], + srcs = ["gcp/test_gcp_node_provider.py"], tags = ["exclusive", "small_size_python_tests", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) # Note(simon): typing tests are not included in module list @@ -339,59 +377,59 @@ py_test( py_test( name = "test_typing", size = "medium", - srcs = SRCS + ["test_typing.py", "typing_files/check_typing_bad.py", - "typing_files/check_typing_good.py"], + srcs = ["test_typing.py", "typing_files/check_typing_bad.py", + "typing_files/check_typing_good.py"], tags = ["exclusive", "small_size_python_tests", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) # TODO: use py_test(env = ...) in the build file with bazel 4.0 py_test( name = "test_tracing", size = "medium", - srcs = SRCS + ["test_tracing.py"], + srcs = ["test_tracing.py"], tags = ["exclusive", "medium_size_python_tests_k_to_z", "team:serve"], - deps = ["//:ray_lib"] + deps = ["//:ray_lib", ":conftest"] ) py_test( name = "test_pydantic_serialization", size = "small", - srcs = SRCS + ["test_pydantic_serialization.py", "pydantic_module.py"], + srcs = ["test_pydantic_serialization.py", "pydantic_module.py"], tags = ["exclusive", "small_size_python_tests", "team:serve"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test( name = "test_runtime_env_validation", size = "small", - srcs = SRCS + ["test_runtime_env_validation.py"], + srcs = ["test_runtime_env_validation.py"], tags = ["exclusive", "small_size_python_tests", "team:serve"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test( name = "test_runtime_env_ray_minimal", size = "medium", - srcs = SRCS + ["test_runtime_env_ray_minimal.py"], + srcs = ["test_runtime_env_ray_minimal.py"], tags = ["exclusive", "medium_size_python_tests_k_to_z", "team:serve"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test( name = "test_serve_ray_minimal", size = "small", - srcs = SRCS + ["test_serve_ray_minimal.py"], + srcs = ["test_serve_ray_minimal.py"], tags = ["exclusive", "small_size_python_tests", "team:serve"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test( name = "kuberay/test_autoscaling_e2e", size = "large", - srcs = SRCS + ["kuberay/test_autoscaling_e2e.py"], + srcs = ["kuberay/test_autoscaling_e2e.py"], tags = ["exclusive", "kuberay_operator", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) # TODO(ekl) we can't currently support tagging these as flaky since there's @@ -413,11 +451,10 @@ py_test_module_list( "test_list_actors_4.py", ], size = "large", - extra_srcs = SRCS, name_suffix = "_client_mode", env = {"RAY_CLIENT_MODE": "1", "RAY_PROFILING": "1"}, tags = ["exclusive", "client_tests", "team:serverless"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -425,7 +462,6 @@ py_test_module_list( "test_actor_in_container.py", ], size = "large", - extra_srcs = SRCS, tags = ["exclusive", "worker-container", "team:serve"], # Now we run this test in a container which has installed ray deps = [], @@ -441,10 +477,9 @@ py_test_module_list( "test_array.py" ], size = "large", - extra_srcs = SRCS, name_suffix = "_debug_mode", tags = ["exclusive", "debug_tests", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) py_test_module_list( @@ -457,8 +492,7 @@ py_test_module_list( "test_array.py" ], size = "large", - extra_srcs = SRCS, name_suffix = "_asan", tags = ["exclusive", "asan_tests", "team:core"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", ":conftest"], ) diff --git a/python/ray/tests/modin/BUILD b/python/ray/tests/modin/BUILD index 3f2aa0c51..da808cf33 100644 --- a/python/ray/tests/modin/BUILD +++ b/python/ray/tests/modin/BUILD @@ -2,6 +2,6 @@ py_test( name = "test_modin", size = "large", srcs = ["test_modin.py"], - deps = ["//:ray_lib"], + deps = ["//:ray_lib", "//python/ray/tests:conftest"], tags = ["team:core", "exclusive"], ) diff --git a/python/ray/tests/test_autoscaler_yaml.py b/python/ray/tests/test_autoscaler_yaml.py index 46ab5f3b0..1d2731005 100644 --- a/python/ray/tests/test_autoscaler_yaml.py +++ b/python/ray/tests/test_autoscaler_yaml.py @@ -93,7 +93,7 @@ class AutoscalingConfigTest(unittest.TestCase): def testValidateDefaultConfig(self): for config_path in CONFIG_PATHS: try: - if "aws/example-multi-node-type.yaml" in config_path: + if os.path.join("aws", "example-multi-node-type.yaml") in config_path: # aws tested in testValidateDefaultConfigAWSMultiNodeTypes. continue if "local" in config_path: diff --git a/python/ray/tests/test_cli.py b/python/ray/tests/test_cli.py index 16f63d684..fb5f6aee0 100644 --- a/python/ray/tests/test_cli.py +++ b/python/ray/tests/test_cli.py @@ -19,6 +19,7 @@ Note: config cache does not work with AWS mocks since the AWS resource ids are """ import glob import multiprocessing as mp +import multiprocessing.connection import os import re import sys @@ -115,7 +116,9 @@ def _unlink_test_ssh_key(): pass -def _start_ray_and_block(runner, child_conn: mp.connection.Connection, as_head: bool): +def _start_ray_and_block( + runner, child_conn: multiprocessing.connection.Connection, as_head: bool +): """Utility function to start a CLI command with `ray start --block` This function is expected to be run in another process, where `child_conn` is used diff --git a/python/ray/tests/test_traceback.py b/python/ray/tests/test_traceback.py index b7af6c43b..f45e25938 100644 --- a/python/ray/tests/test_traceback.py +++ b/python/ray/tests/test_traceback.py @@ -315,7 +315,10 @@ RuntimeError: Failed to unpickle serialized exception""" try: ray.get(f.remote()) except Exception as ex: - assert clean_noqa(expected_output) == scrub_traceback(str(ex)) + python310_extra_exc_msg = "test_unpickleable_stacktrace..NoPickleError." + assert clean_noqa(expected_output) == scrub_traceback(str(ex)).replace( + f"TypeError: {python310_extra_exc_msg}", "TypeError: " + ) def test_serialization_error_message(shutdown_only): @@ -351,29 +354,30 @@ def test_serialization_error_message(shutdown_only): task_with_unserializable_arg.remote(lock) def scrub_traceback(ex): - return re.sub("object at .*> for a", "object at ADDRESS> for a", ex) + ex = re.sub("object at .*> for a", "object at ADDRESS> for a", ex) + ex = re.sub( + r"com_github_ray_project_ray\.python\.ray\.tests\.test_traceback", + "test_traceback", + ex, + ) + ex = re.sub(r"python\.ray\.tests\.test_traceback", "test_traceback", ex) + return ex - test_prefix = "com_github_ray_project_ray.python.ray.tests." - - assert clean_noqa(expected_output_task) == scrub_traceback( - str(excinfo.value) - ).replace(test_prefix, "") + assert clean_noqa(expected_output_task) == scrub_traceback(str(excinfo.value)) """ Test an actor with an unserializable object. """ with pytest.raises(TypeError) as excinfo: a = A.remote(lock) print(a) - assert clean_noqa(expected_output_actor) == scrub_traceback( - str(excinfo.value) - ).replace(test_prefix, "") + assert clean_noqa(expected_output_actor) == scrub_traceback(str(excinfo.value)) """ Test the case where an unserializable object is captured by tasks. """ with pytest.raises(TypeError) as excinfo: capture_lock.remote() - assert clean_noqa(expected_capture_output_task) == str(excinfo.value).replace( - test_prefix, "" + assert clean_noqa(expected_capture_output_task) == scrub_traceback( + str(excinfo.value) ) """ Test the case where an unserializable object is captured by actors. @@ -381,8 +385,8 @@ def test_serialization_error_message(shutdown_only): with pytest.raises(TypeError) as excinfo: b = B.remote() print(b) - assert clean_noqa(expected_capture_output_actor) == str(excinfo.value).replace( - test_prefix, "" + assert clean_noqa(expected_capture_output_actor) == scrub_traceback( + str(excinfo.value) ) diff --git a/python/ray/tests/test_tracing.py b/python/ray/tests/test_tracing.py index 61b147ae2..73fee1f51 100644 --- a/python/ray/tests/test_tracing.py +++ b/python/ray/tests/test_tracing.py @@ -77,9 +77,12 @@ def get_span_list(): def get_span_dict(span_list): """Given a list of span names, return dictionary of span names.""" + strip_prefix = "python.ray.tests." span_names = {} for span in span_list: span_name = span["name"] + if span_name.startswith(strip_prefix): + span_name = span_name[len(strip_prefix) :] if span_name in span_names: span_names[span_name] += 1 else: @@ -103,7 +106,7 @@ def task_helper(): # The spans could show up in a different order, so just check that # all spans are as expected span_names = get_span_dict(span_list) - return span_names == { + assert span_names == { "test_tracing.f ray.remote": 1, "test_tracing.f ray.remote_worker": 1, } @@ -171,11 +174,11 @@ def async_actor_helper(): def test_tracing_task_init_workflow(cleanup_dirs, ray_start_init_tracing): - assert task_helper() + task_helper() def test_tracing_task_start_workflow(cleanup_dirs, ray_start_cli_tracing): - assert task_helper() + task_helper() def test_tracing_sync_actor_init_workflow(cleanup_dirs, ray_start_init_tracing): diff --git a/python/ray/tune/BUILD b/python/ray/tune/BUILD index 07d2e5b61..f726aa8d8 100644 --- a/python/ray/tune/BUILD +++ b/python/ray/tune/BUILD @@ -68,6 +68,7 @@ py_test( name = "test_cluster_searcher", size = "large", srcs = ["tests/test_cluster_searcher.py"], + data = ["tests/_test_cluster_interrupt_searcher.py"], deps = [":tune_lib"], tags = ["team:ml", "exclusive", "tests_dir_C"], ) diff --git a/python/ray/workflow/BUILD b/python/ray/workflow/BUILD index 7aadec547..beaf33a16 100644 --- a/python/ray/workflow/BUILD +++ b/python/ray/workflow/BUILD @@ -5,13 +5,7 @@ # -------------------------------------------------------------------- load("//bazel:python.bzl", "py_test_module_list") -SRCS = [] + select({ - "@bazel_tools//src/conditions:windows": glob([ - # TODO(mehrdadn): This should be added for all platforms once resulting errors are fixed - "**/conftest.py", - ]), - "//conditions:default": [], -}) +SRCS = glob(["**/conftest.py"]) LARGE_TESTS = ["tests/test_recovery.py", "tests/test_basic_workflows_2.py", "tests/test_metadata.py"] diff --git a/python/ray/workflow/tests/test_basic_workflows_2.py b/python/ray/workflow/tests/test_basic_workflows_2.py index bad9ac92f..35f5b6767 100644 --- a/python/ray/workflow/tests/test_basic_workflows_2.py +++ b/python/ray/workflow/tests/test_basic_workflows_2.py @@ -304,7 +304,8 @@ def test_get_named_step_default(workflow_start_regular, tmp_path): assert math.factorial(5) == workflow.run(factorial.bind(5), workflow_id="factorial") for i in range(5): step_name = ( - "test_basic_workflows_2.test_get_named_step_default.locals.factorial" + "python.ray.workflow.tests.test_basic_workflows_2." + "test_get_named_step_default.locals.factorial" ) if i != 0: step_name += "_" + str(i) diff --git a/python/requirements.txt b/python/requirements.txt index c9b5302b3..1d99a517a 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -78,7 +78,7 @@ pexpect Pillow; platform_system != "Windows" pygments pyspark==3.1.2 -pytest==5.4.3 +pytest==7.0.1 pytest-asyncio==0.16.0 pytest-rerunfailures pytest-sugar diff --git a/release/BUILD b/release/BUILD index 562a7c235..acd4da0df 100644 --- a/release/BUILD +++ b/release/BUILD @@ -207,7 +207,8 @@ py_test( name = "test_config", tags = ["team:ci", "release_unit"], size = "small", - srcs = ["ray_release/tests/test_config.py"] + srcs = ["ray_release/tests/test_config.py"], + data = ["release_tests.yaml"], ) py_test( @@ -228,12 +229,18 @@ py_test( name = "test_run_script", tags = ["team:ci", "release_unit"], size = "small", - srcs = ["ray_release/tests/test_run_script.py"] + srcs = ["ray_release/tests/test_run_script.py"], + data = [ + "run_release_test.sh", + "ray_release/tests/_test_catch_args.py", + "ray_release/tests/_test_run_release_test_sh.py", + ], ) py_test( name = "test_wheels", tags = ["team:ci", "release_unit"], size = "small", - srcs = ["ray_release/tests/test_wheels.py"] + srcs = ["ray_release/tests/test_wheels.py"], + deps = ["//:ray_lib"], )