Merge branch 'main' into semver

Author: zulinx86

tests/integration_tests/functional/test_api.py

@@ -8,7 +8,6 @@
 import platform
 import re
 import resource
-import time
 from pathlib import Path
 
 import pytest
@@ -1018,12 +1017,9 @@ def test_api_balloon(uvm_nano):
         )
 
     # Start the microvm.
+    test_microvm.add_net_iface()
     test_microvm.start()
 
-    # Give the balloon driver time to initialize.
-    # 500 ms is the maximum acceptable boot time.
-    time.sleep(0.5)
-
     # But updating should be OK.
     test_microvm.api.balloon.patch(amount_mib=4)
 

tests/integration_tests/functional/test_cpu_features_x86_64.py

@@ -541,7 +541,7 @@ def test_cpu_cpuid_snapshot(microvm_factory, guest_kernel, rootfs, cpu_template_
     """
     cpu_template_name = get_cpu_template_name(cpu_template_any)
     if cpu_template_name not in MSR_SUPPORTED_TEMPLATES:
-        pytest.skip("This test does not support {cpu_template_name} template.")
+        pytest.skip(f"This test does not support {cpu_template_name} template.")
 
     shared_names = SNAPSHOT_RESTORE_SHARED_NAMES
 
@@ -611,7 +611,7 @@ def test_cpu_cpuid_restore(microvm_factory, guest_kernel, cpu_template_any):
     """
     cpu_template_name = get_cpu_template_name(cpu_template_any)
     if cpu_template_name not in MSR_SUPPORTED_TEMPLATES:
-        pytest.skip("This test does not support {cpu_template_name} template.")
+        pytest.skip(f"This test does not support {cpu_template_name} template.")
 
     shared_names = SNAPSHOT_RESTORE_SHARED_NAMES
     snapshot_artifacts_dir = (
@@ -646,8 +646,8 @@ def test_cpu_template(uvm_plain_any, cpu_template_any, microvm_factory):
     supported CPU templates.
     """
     cpu_template_name = get_cpu_template_name(cpu_template_any)
-    if cpu_template_name not in ["T2", "T2S", "SPR_TO_T2_5.10", "SPR_TO_T2_6.1" "C3"]:
-        pytest.skip("This test does not support {cpu_template_name} template.")
+    if cpu_template_name not in ["T2", "T2S", "SPR_TO_T2_5.10", "SPR_TO_T2_6.1", "C3"]:
+        pytest.skip(f"This test does not support {cpu_template_name} template.")
 
     test_microvm = uvm_plain_any
     test_microvm.spawn()

tests/integration_tests/functional/test_net.py

@@ -108,9 +108,12 @@ def test_tap_offload(uvm_any):
     # Start a UDP server in the guest
     # vm.ssh.check_output(f"nohup socat UDP-LISTEN:{port} - > {out_filename} &")
     vm.ssh.check_output(
-        f"nohup socat UDP4-LISTEN:{port} OPEN:{out_filename},creat > /dev/null 2>&1 &"
+        f"nohup socat UDP4-LISTEN:{port} CREATE:{out_filename} > /dev/null 2>&1 &"
     )
 
+    # wait for socat server to spin up
+    time.sleep(1)
+
     # Try to send a UDP message from host with UDP offload enabled
     vm.netns.check_output(f"python3 ./host_tools/udp_offload.py {vm.ssh.host} {port}")