Skip to content

Commit 9f3676c

Browse files
committed
WIP install 9/n: parametrize firstboot to run on both install and upgrade
FIXME: must use different names for input and output XVA
1 parent 7279d2c commit 9f3676c

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

tests/install/test.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,18 @@ def test_install_821_uefi(self, iso_remaster, create_vms):
121121
host_vm.export("test_install_821_uefi-vm1.xva", "zstd",
122122
use_cache=CACHE_IMPORTED_VM)
123123

124-
@pytest.mark.dependency(depends=["TestNested::test_install_821_uefi"])
124+
125+
@pytest.mark.parametrize("base", [
126+
pytest.param("install", marks=pytest.mark.dependency(
127+
depends=["TestNested::test_install_821_uefi"])),
128+
pytest.param("upgrade", marks=pytest.mark.dependency(
129+
depends=["TestNested::test_upgrade_821_uefi"])),
130+
])
125131
@pytest.mark.vm_definitions(
126132
dict(name="vm 1",
127133
image="test_install_821_uefi-vm1.xva"
128134
))
129-
def test_firstboot_821_uefi(self, create_vms):
135+
def test_firstboot_821_uefi(self, create_vms, base):
130136
host_vm = create_vms[0]
131137
vif = host_vm.vifs()[0]
132138
mac_address = vif.param_get('MAC')
@@ -225,7 +231,7 @@ def test_firstboot_821_uefi(self, create_vms):
225231
host_vm.export("test_firstboot_821_uefi-vm1.xva", "zstd",
226232
use_cache=CACHE_IMPORTED_VM)
227233

228-
@pytest.mark.dependency(depends=["TestNested::test_firstboot_821_uefi"])
234+
@pytest.mark.dependency(depends=["TestNested::test_firstboot_821_uefi[install]"])
229235
@pytest.mark.vm_definitions(
230236
dict(name="vm 1",
231237
image="test_firstboot_821_uefi-vm1.xva"

0 commit comments

Comments
 (0)