Skip to content

Commit dd432bc

Browse files
committed
remove unused fixtures
and fix the status VM status check in `vm_from_uploaded_dv` since `VirtualMachineInstance.Status` doesn't contain `SCHEDULING` constant Signed-off-by: Adam Cinko <acinko@redhat.com>
1 parent d29620d commit dd432bc

File tree

1 file changed

+2
-30
lines changed

1 file changed

+2
-30
lines changed

tests/storage/test_wffc.py

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
check_upload_virtctl_result,
2222
create_dv,
2323
create_vm_from_dv,
24-
data_volume,
2524
data_volume_template_with_source_ref_dict,
2625
virtctl_upload_dv,
2726
)
@@ -37,34 +36,6 @@
3736
WFFC_DV_NAME = "wffc-dv-name"
3837

3938

40-
@pytest.fixture(scope="module")
41-
def data_volume_multi_wffc_storage_scope_module(
42-
request,
43-
namespace,
44-
storage_class_matrix_wffc_matrix__module__,
45-
):
46-
yield from data_volume(
47-
request=request,
48-
namespace=namespace,
49-
storage_class=[*storage_class_matrix_wffc_matrix__module__][0],
50-
client=namespace.client,
51-
)
52-
53-
54-
@pytest.fixture()
55-
def data_volume_multi_wffc_storage_scope_function(
56-
request,
57-
namespace,
58-
storage_class_matrix_wffc_matrix__module__,
59-
):
60-
yield from data_volume(
61-
request=request,
62-
namespace=namespace,
63-
storage_class=[*storage_class_matrix_wffc_matrix__module__][0],
64-
client=namespace.client,
65-
)
66-
67-
6839
@pytest.fixture()
6940
def blank_dv_wffc_scope_function(request, unprivileged_client, namespace, storage_class_matrix_wffc_matrix__module__):
7041
with create_dv(
@@ -135,7 +106,8 @@ def vm_from_uploaded_dv(namespace, uploaded_dv_via_virtctl_wffc, uploaded_wffc_d
135106
pvc = uploaded_wffc_dv.pvc
136107
vm_dv.start(wait=False)
137108
if pvc.use_populator:
138-
vm_status = VirtualMachineInstance.Status.SCHEDULING
109+
# No scheduling status in VirtualMachineInstance.Status, using string literal instead
110+
vm_status = "Scheduling"
139111
bounded_pvc = pvc.prime_pvc
140112
else:
141113
vm_status = VirtualMachineInstance.Status.PENDING

0 commit comments

Comments
 (0)