Revert "test: hack: tmp: disable serial for A/B tests"

This reverts commit a2d1c9e.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

tests/conftest.py

@@ -605,10 +605,7 @@ def uvm_booted(
 ):
     """Return a booted uvm"""
     uvm = microvm_factory.build(guest_kernel, rootfs, pci=pci_enabled)
-    if getattr(microvm_factory, "hack_no_serial", False):
-        uvm.spawn(serial_out_path=None)
-    else:
-        uvm.spawn()
+    uvm.spawn()
     uvm.basic_config(vcpu_count=vcpu_count, mem_size_mib=mem_size_mib)
     uvm.set_cpu_template(cpu_template)
     uvm.add_net_iface()

tests/framework/microvm.py

@@ -1231,10 +1231,7 @@ def build(self, kernel=None, rootfs=None, **kwargs):
     def build_from_snapshot(self, snapshot: Snapshot):
         """Build a microvm from a snapshot"""
         vm = self.build()
-        if getattr(self, "hack_no_serial", False):
-            vm.spawn(serial_out_path=None)
-        else:
-            vm.spawn()
+        vm.spawn()
         vm.restore_from_snapshot(snapshot, resume=True)
         return vm
 

tests/integration_tests/performance/test_block.py

@@ -174,7 +174,7 @@ def test_block_performance(
     Execute block device emulation benchmarking scenarios.
     """
     vm = uvm_plain_acpi
-    vm.spawn(log_level="Info", emit_metrics=True, serial_out_path=None)
+    vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
     vm.add_net_iface()
     # Add a secondary block device for benchmark tests.
@@ -223,7 +223,7 @@ def test_block_vhost_user_performance(
     """
 
     vm = uvm_plain_acpi
-    vm.spawn(log_level="Info", emit_metrics=True, serial_out_path=None)
+    vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
     vm.add_net_iface()
 

tests/integration_tests/performance/test_boottime.py

@@ -100,7 +100,7 @@ def launch_vm_with_boot_timer(
     """Launches a microVM with guest-timer and returns the reported metrics for it"""
     vm = microvm_factory.build(guest_kernel_acpi, rootfs_rw, pci=pci_enabled)
     vm.jailer.extra_args.update({"boot-timer": None})
-    vm.spawn(serial_out_path=None)
+    vm.spawn()
     vm.basic_config(
         vcpu_count=vcpu_count,
         mem_size_mib=mem_size_mib,

tests/integration_tests/performance/test_memory_overhead.py

@@ -47,7 +47,7 @@ def test_memory_overhead(
         microvm = microvm_factory.build(
             guest_kernel_acpi, rootfs, pci=pci_enabled, monitor_memory=False
         )
-        microvm.spawn(emit_metrics=True, serial_out_path=None)
+        microvm.spawn(emit_metrics=True)
         microvm.basic_config(vcpu_count=vcpu_count, mem_size_mib=mem_size_mib)
         microvm.add_net_iface()
         microvm.start()

tests/integration_tests/performance/test_network.py

@@ -46,7 +46,7 @@ def network_microvm(request, uvm_plain_acpi):
     guest_vcpus = request.param
 
     vm = uvm_plain_acpi
-    vm.spawn(log_level="Info", emit_metrics=True, serial_out_path=None)
+    vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=guest_vcpus, mem_size_mib=guest_mem_mib)
     vm.add_net_iface()
     vm.start()

tests/integration_tests/performance/test_snapshot.py

@@ -52,7 +52,7 @@ def boot_vm(self, microvm_factory, guest_kernel, rootfs, pci_enabled) -> Microvm
             monitor_memory=False,
             pci=pci_enabled,
         )
-        vm.spawn(log_level="Info", emit_metrics=True, serial_out_path=None)
+        vm.spawn(log_level="Info", emit_metrics=True)
         vm.time_api_requests = False
         vm.basic_config(
             vcpu_count=self.vcpus,
@@ -271,7 +271,7 @@ def test_snapshot_create_latency(
     """Measure the latency of creating a Full snapshot"""
 
     vm = uvm_plain
-    vm.spawn(serial_out_path=None)
+    vm.spawn()
     vm.basic_config(
         vcpu_count=2,
         mem_size_mib=512,

tests/integration_tests/performance/test_vsock.py

@@ -88,7 +88,7 @@ def test_vsock_throughput(
 
     mem_size_mib = 1024
     vm = uvm_plain_acpi
-    vm.spawn(log_level="Info", emit_metrics=True, serial_out_path=None)
+    vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=mem_size_mib)
     vm.add_net_iface()
     # Create a vsock device

tests/integration_tests/security/test_vulnerabilities.py

@@ -211,7 +211,6 @@ def microvm_factory_a(record_property):
     bin_dir = git_clone(Path("../build") / revision_a, revision_a).resolve()
     record_property("firecracker_bin", str(bin_dir / "firecracker"))
     uvm_factory = MicroVMFactory(bin_dir)
-    uvm_factory.hack_no_serial = True
     yield uvm_factory
     uvm_factory.kill()