[CI] Restructure vLLM-Omni Test Layout, Fixture Scope, and Support Modules (#2620)

Signed-off-by: wangyu <410167048@qq.com>

tests/diffusion/models/bagel/test_bagel_lora.py

@@ -11,7 +11,7 @@ import pytest
 import torch
 from safetensors.torch import save_file
 
-from tests.diffusion.lora.conftest import (
+from tests.diffusion.lora.helpers import (
     DummyBaseLayerWithLoRA,
     FakeLinearBase,
     fake_replace_submodule,

tests/diffusion/models/flux2/test_flux2_transformer_tp.py

@@ -2,7 +2,7 @@ import pytest
 import torch
 from pytest_mock import MockerFixture
 
-from tests.utils import hardware_test
+from tests.helpers.mark import hardware_test
 from vllm_omni.diffusion.models.flux2.flux2_transformer import (
     Flux2PosEmbed,
     Flux2Transformer2DModel,

tests/diffusion/models/glm_image/test_glm_image_sp.py

@@ -2,27 +2,26 @@
 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project
 """Tests for GLM-Image Sequence Parallelism support."""
 
-from unittest.mock import MagicMock, patch
-
 import pytest
 
 from vllm_omni.diffusion.data import DiffusionParallelConfig
 
 
 @pytest.fixture(scope="function", autouse=True)
-def setup_sp_groups():
+def setup_sp_groups(mocker):
     """Set up SP and TP groups for each test function."""
-    with patch("vllm_omni.diffusion.distributed.parallel_state.get_sp_group") as mock_get_sp_group:
-        with patch("vllm.model_executor.layers.linear.get_tensor_model_parallel_world_size", return_value=1):
-            with patch("vllm.distributed.parallel_state.get_tp_group") as mock_get_tp_group:
-                mock_sp_group = MagicMock()
-                mock_sp_group.world_size = 4
-                mock_get_sp_group.return_value = mock_sp_group
+    mock_get_sp_group = mocker.patch("vllm_omni.diffusion.distributed.parallel_state.get_sp_group")
+    mocker.patch("vllm.model_executor.layers.linear.get_tensor_model_parallel_world_size", return_value=1)
+    mock_get_tp_group = mocker.patch("vllm.distributed.parallel_state.get_tp_group")
 
-                mock_tp_group = MagicMock()
-                mock_tp_group.world_size = 1
-                mock_get_tp_group.return_value = mock_tp_group
-                yield
+    mock_sp_group = mocker.MagicMock()
+    mock_sp_group.world_size = 4
+    mock_get_sp_group.return_value = mock_sp_group
+
+    mock_tp_group = mocker.MagicMock()
+    mock_tp_group.world_size = 1
+    mock_get_tp_group.return_value = mock_tp_group
+    yield
 
 
 pytestmark = [pytest.mark.core_model, pytest.mark.cpu]