test: Use Microvm.wait_for_up in tests that boot via config

Tests that boot a microvm via a config file do not use `.start()`, as
`.spawn()` already start the bootup process. This is probably why these
tests were overlooked when we did the `.wait_for_up()` refactor.

Fix potential issues by adding the `wait_for_up()` calls here, to
replace various homegrown waiting solutions.

Some tests do not have network devices, and also don't really need to
wait for the guest to have booted as they only validate firecracker API
responses. Don't try to use wait_for_up in those (since we can't
anyway).

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

Author: roypat

tests/integration_tests/functional/test_cmd_line_start.py

@@ -7,7 +7,6 @@
 import platform
 import re
 import shutil
-import time
 from pathlib import Path
 
 import pytest
@@ -164,7 +163,7 @@ def test_config_start_no_api_exit(uvm_plain, vm_config_file):
     test_microvm.jailer.extra_args.update({"no-api": None})
 
     test_microvm.spawn()  # Start Firecracker and MicroVM
-    time.sleep(3)  # Wait for startup
+    test_microvm.wait_for_up()
     test_microvm.ssh.run("reboot")  # Exit
 
     test_microvm.mark_killed()  # waits for process to terminate
@@ -266,7 +265,7 @@ def test_config_start_with_limit(uvm_plain, vm_config_file):
     response += '{ "error": "Request payload with size 260 is larger than '
     response += "the limit of 250 allowed by server.\n"
     response += 'All previous unanswered requests will be dropped." }'
-    _, stdout, _stderr = utils.check_output(cmd)
+    _, stdout, _ = utils.check_output(cmd)
     assert stdout.encode("utf-8") == response.encode("utf-8")
 
 
@@ -420,8 +419,7 @@ def test_config_start_and_mmds_with_api(uvm_plain, vm_config_file):
 
     # Network namespace has already been created.
     test_microvm.spawn()
-
-    assert test_microvm.state == "Running"
+    test_microvm.wait_for_up()
 
     data_store = {
         "latest": {
@@ -480,6 +478,7 @@ def test_with_config_and_metadata_no_api(uvm_plain, vm_config_file, metadata_fil
     _configure_network_interface(test_microvm)
     test_microvm.jailer.extra_args.update({"no-api": None})
     test_microvm.spawn()
+    test_microvm.wait_for_up()
 
     # Get MMDS version and IPv4 address configured from the file.
     version, ipv4_address = _get_optional_fields_from_file(vm_config_file)