diff --git a/.buildkite/test-pipeline.yaml b/.buildkite/test-pipeline.yaml index db7351edbb8d..ebcf51981ef3 100644 --- a/.buildkite/test-pipeline.yaml +++ b/.buildkite/test-pipeline.yaml @@ -57,9 +57,10 @@ steps: - vllm/ - tests/mq_llm_engine - tests/async_engine - - tests/test_inputs + - tests/test_inputs.py + - tests/test_outputs.py - tests/multimodal - - tests/test_utils + - tests/utils_ - tests/worker - tests/standalone_tests/lazy_imports.py commands: @@ -70,7 +71,7 @@ steps: - pytest -v -s test_inputs.py - pytest -v -s test_outputs.py - pytest -v -s multimodal - - pytest -v -s test_utils.py # Utils + - pytest -v -s utils_ # Utils - pytest -v -s worker # Worker - label: Python-only Installation Test diff --git a/tests/utils_/__init__.py b/tests/utils_/__init__.py new file mode 100644 index 000000000000..e6b4c3f6364c --- /dev/null +++ b/tests/utils_/__init__.py @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# SPDX-FileCopyrightText: Copyright contributors to the vLLM project +""" +This module is named `utils_` instead of `utils` to avoid obscuring +`tests/utils.py`. +""" diff --git a/tests/standalone_tests/test_tensor_schema.py b/tests/utils_/test_tensor_schema.py similarity index 100% rename from tests/standalone_tests/test_tensor_schema.py rename to tests/utils_/test_tensor_schema.py diff --git a/tests/test_utils.py b/tests/utils_/test_utils.py similarity index 99% rename from tests/test_utils.py rename to tests/utils_/test_utils.py index 53a34642e5ba..a2db1ae68434 100644 --- a/tests/test_utils.py +++ b/tests/utils_/test_utils.py @@ -5,7 +5,6 @@ import asyncio import hashlib import json -import logging import pickle import socket from collections.abc import AsyncIterator @@ -29,7 +28,7 @@ from vllm.utils import (CacheInfo, FlexibleArgumentParser, LRUCache, merge_async_iterators, sha256, split_host_port, split_zmq_path, supports_kw, swap_dict_values) -from .utils import create_new_process_for_each_test, error_on_warning +from ..utils import create_new_process_for_each_test, error_on_warning @pytest.mark.asyncio diff --git a/tools/check_pickle_imports.py b/tools/check_pickle_imports.py index 5e99dc63ebe0..444e2bf53f99 100644 --- a/tools/check_pickle_imports.py +++ b/tools/check_pickle_imports.py @@ -32,7 +32,7 @@ ALLOWED_FILES = set([ 'vllm/multimodal/hasher.py', 'vllm/transformers_utils/config.py', 'vllm/model_executor/models/registry.py', - 'tests/test_utils.py', + 'tests/utils_/test_utils.py', 'tests/tokenization/test_cached_tokenizer.py', 'vllm/distributed/utils.py', 'vllm/distributed/parallel_state.py',