Skip to content

Commit 5038e08

Browse files
authored
refactor test according to upstream features (#1208)
Signed-off-by: Milind waykole <mwaykole@redhat.com>
1 parent 7768aa4 commit 5038e08

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+208
-235
lines changed

tests/model_serving/model_server/kserve/components/__init__.py renamed to tests/model_serving/model_server/kserve/autoscaling/__init__.py

File renamed without changes.

tests/model_serving/model_server/kserve/keda/conftest.py renamed to tests/model_serving/model_server/kserve/autoscaling/keda/conftest.py

File renamed without changes.

tests/model_serving/model_server/kserve/keda/test_isvc_keda_scaling_cpu.py renamed to tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_cpu.py

File renamed without changes.

tests/model_serving/model_server/kserve/keda/test_isvc_keda_scaling_gpu.py renamed to tests/model_serving/model_server/kserve/autoscaling/keda/test_isvc_keda_scaling_gpu.py

File renamed without changes.

tests/model_serving/model_server/kserve/keda/utils.py renamed to tests/model_serving/model_server/kserve/autoscaling/keda/utils.py

File renamed without changes.

tests/model_serving/model_server/kserve/kueue/conftest.py renamed to tests/model_serving/model_server/kserve/autoscaling/kueue/conftest.py

File renamed without changes.

tests/model_serving/model_server/kserve/kueue/test_kueue_isvc_raw.py renamed to tests/model_serving/model_server/kserve/autoscaling/kueue/test_kueue_isvc_raw.py

File renamed without changes.

tests/model_serving/model_server/kserve/components/kserve_dsc_deployment_mode/__init__.py renamed to tests/model_serving/model_server/kserve/inference_service_lifecycle/__init__.py

File renamed without changes.

tests/model_serving/model_server/kserve/inference_service_configuration/conftest.py renamed to tests/model_serving/model_server/kserve/inference_service_lifecycle/conftest.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@
66
from ocp_resources.inference_service import InferenceService
77
from ocp_resources.namespace import Namespace
88
from ocp_resources.pod import Pod
9+
from ocp_resources.resource import ResourceEditor
910
from ocp_resources.serving_runtime import ServingRuntime
1011

11-
from tests.model_serving.model_server.kserve.inference_service_configuration.constants import (
12+
from tests.model_serving.model_server.kserve.inference_service_lifecycle.constants import (
1213
ISVC_ENV_VARS,
1314
ORIGINAL_PULL_SECRET,
1415
UPDATED_PULL_SECRET,
1516
)
16-
from tests.model_serving.model_server.kserve.inference_service_configuration.utils import (
17+
from tests.model_serving.model_server.kserve.inference_service_lifecycle.utils import (
1718
update_inference_service,
1819
)
19-
from utilities.constants import KServeDeploymentType
20+
from utilities.constants import Annotations, KServeDeploymentType
2021
from utilities.inference_utils import create_isvc
2122
from utilities.infra import get_pods_by_isvc_label
2223

@@ -127,3 +128,20 @@ def updated_isvc_remove_pull_secret(
127128
},
128129
):
129130
yield model_car_raw_inference_service_with_pull_secret
131+
132+
133+
@pytest.fixture(scope="function")
134+
def patched_raw_inference_service_stop_annotation(
135+
request: pytest.FixtureRequest,
136+
ovms_raw_inference_service: InferenceService,
137+
) -> Generator[InferenceService, Any, Any]:
138+
with ResourceEditor(
139+
patches={
140+
ovms_raw_inference_service: {
141+
"metadata": {
142+
"annotations": {Annotations.KserveIo.FORCE_STOP_RUNTIME: request.param.get("stop", "false")}
143+
},
144+
}
145+
}
146+
):
147+
yield ovms_raw_inference_service

tests/model_serving/model_server/kserve/inference_service_configuration/constants.py renamed to tests/model_serving/model_server/kserve/inference_service_lifecycle/constants.py

File renamed without changes.

0 commit comments

Comments
 (0)