Skip to content

Commit 034de2f

Browse files
committed
test(pci): remove pci=off command line from tests
pci=off is just an optimization to skip the probing, it shouldn't matter to the functionality of the tests. Dropping it to allow them to run with PCI. Signed-off-by: Riccardo Mancini <[email protected]>
1 parent 557f6e2 commit 034de2f

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

tests/integration_tests/functional/test_error_code.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_enosys_error_code(uvm_plain):
2525
vm.memory_monitor = None
2626
vm.basic_config(
2727
vcpu_count=1,
28-
boot_args="reboot=k panic=1 pci=off init=/usr/local/bin/devmemread",
28+
boot_args="reboot=k panic=1 init=/usr/local/bin/devmemread",
2929
)
3030
vm.start()
3131

tests/integration_tests/functional/test_kernel_cmdline.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ def test_init_params(uvm_plain):
2121
# Ubuntu version from the /etc/issue file.
2222
vm.basic_config(
2323
vcpu_count=1,
24-
boot_args="console=ttyS0 reboot=k panic=1 pci=off"
25-
" init=/bin/cat -- /etc/issue",
24+
boot_args="console=ttyS0 reboot=k panic=1 init=/bin/cat -- /etc/issue",
2625
)
2726

2827
vm.start()

tests/integration_tests/functional/test_serial_io.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_serial_after_snapshot(uvm_plain, microvm_factory):
5555
microvm.basic_config(
5656
vcpu_count=2,
5757
mem_size_mib=256,
58-
boot_args="console=ttyS0 reboot=k panic=1 pci=off",
58+
boot_args="console=ttyS0 reboot=k panic=1",
5959
)
6060
serial = Serial(microvm)
6161
serial.open()
@@ -144,7 +144,7 @@ def test_serial_dos(uvm_plain_any):
144144
# Set up the microVM with 1 vCPU and a serial console.
145145
microvm.basic_config(
146146
vcpu_count=1,
147-
boot_args="console=ttyS0 reboot=k panic=1 pci=off",
147+
boot_args="console=ttyS0 reboot=k panic=1",
148148
)
149149
microvm.add_net_iface()
150150
microvm.start()
@@ -176,7 +176,7 @@ def test_serial_block(uvm_plain_any):
176176
test_microvm.basic_config(
177177
vcpu_count=1,
178178
mem_size_mib=512,
179-
boot_args="console=ttyS0 reboot=k panic=1 pci=off",
179+
boot_args="console=ttyS0 reboot=k panic=1",
180180
)
181181
test_microvm.add_net_iface()
182182
test_microvm.start()

tests/integration_tests/performance/test_boottime.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,13 @@ def launch_vm_with_boot_timer(
9898
microvm_factory, guest_kernel_acpi, rootfs_rw, vcpu_count, mem_size_mib, pci_enabled
9999
):
100100
"""Launches a microVM with guest-timer and returns the reported metrics for it"""
101-
boot_args = DEFAULT_BOOT_ARGS if pci_enabled else DEFAULT_BOOT_ARGS + " pci=off"
102-
vm = microvm_factory.build(guest_kernel_acpi, rootfs_rw)
101+
vm = microvm_factory.build(guest_kernel_acpi, rootfs_rw, pci=pci_enabled)
103102
vm.jailer.extra_args.update({"boot-timer": None})
104-
vm.spawn(pci=pci_enabled)
103+
vm.spawn()
105104
vm.basic_config(
106105
vcpu_count=vcpu_count,
107106
mem_size_mib=mem_size_mib,
108-
boot_args=boot_args + " init=/usr/local/bin/init",
107+
boot_args=DEFAULT_BOOT_ARGS + " init=/usr/local/bin/init",
109108
enable_entropy_device=True,
110109
)
111110
vm.add_net_iface()

tests/integration_tests/performance/test_initrd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_microvm_initrd_with_serial(uvm_with_initrd, huge_pages):
3333
vm.basic_config(
3434
add_root_device=False,
3535
vcpu_count=1,
36-
boot_args="console=ttyS0 reboot=k panic=1 pci=off",
36+
boot_args="console=ttyS0 reboot=k panic=1",
3737
use_initrd=True,
3838
huge_pages=huge_pages,
3939
)

0 commit comments

Comments
 (0)