|
21 | 21 | check_upload_virtctl_result, |
22 | 22 | create_dv, |
23 | 23 | create_vm_from_dv, |
24 | | - data_volume, |
25 | 24 | data_volume_template_with_source_ref_dict, |
26 | 25 | virtctl_upload_dv, |
27 | 26 | ) |
|
37 | 36 | WFFC_DV_NAME = "wffc-dv-name" |
38 | 37 |
|
39 | 38 |
|
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 | | - |
68 | 39 | @pytest.fixture() |
69 | 40 | def blank_dv_wffc_scope_function(request, unprivileged_client, namespace, storage_class_matrix_wffc_matrix__module__): |
70 | 41 | with create_dv( |
@@ -135,7 +106,8 @@ def vm_from_uploaded_dv(namespace, uploaded_dv_via_virtctl_wffc, uploaded_wffc_d |
135 | 106 | pvc = uploaded_wffc_dv.pvc |
136 | 107 | vm_dv.start(wait=False) |
137 | 108 | 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" |
139 | 111 | bounded_pvc = pvc.prime_pvc |
140 | 112 | else: |
141 | 113 | vm_status = VirtualMachineInstance.Status.PENDING |
|
0 commit comments