fix intermittent serial_after_snapshot

The test started failling after latest AMI
update on 4.14. Seems that reading from the
screen log file the output of the microVM
became slower.

Signed-off-by: Diana Popa <[email protected]>
(cherry picked from commit e779c54)

Author: dianpopa

tests/framework/microvm.py

@@ -899,7 +899,7 @@ def __del__(self):
 class Serial:
     """Class for serial console communication with a Microvm."""
 
-    RX_TIMEOUT_S = 5
+    RX_TIMEOUT_S = 20
 
     def __init__(self, vm):
         """Initialize a new Serial object."""
@@ -952,6 +952,7 @@ def rx(self, token="\n"):
             if rx_str.endswith(token):
                 break
             if (time.time() - start) >= self.RX_TIMEOUT_S:
+                self._vm.kill()
                 assert False
 
         return rx_str

tests/integration_tests/functional/test_serial_io.py

@@ -17,6 +17,8 @@
 import host_tools.logging as log_tools
 import host_tools.network as net_tools
 
+PLATFORM = platform.machine()
+
 
 class WaitTerminal(TestState):  # pylint: disable=too-few-public-methods
     """Initial state when we wait for the login prompt."""
@@ -55,40 +57,38 @@ def test_serial_after_snapshot(bin_cloner_path):
     """
     vm_builder = MicrovmBuilder(bin_cloner_path)
     vm_instance = vm_builder.build_vm_nano(
-        diff_snapshots=False,
         daemonize=False,
     )
     microvm = vm_instance.vm
     root_disk = vm_instance.disks[0]
     ssh_key = vm_instance.ssh_key
 
-    microvm.start()
     serial = Serial(microvm)
     serial.open()
+    microvm.start()
 
     # Image used for tests on aarch64 has autologon
-    if platform.machine() == "x86_64":
-        serial.rx(token='login: ')
+    if PLATFORM == "x86_64":
+        serial.rx(token="login: ")
         serial.tx("root")
         serial.rx("Password: ")
         serial.tx("root")
     # Make sure that at the time we snapshot the vm, the user is logged in.
     serial.rx("#")
 
     snapshot_builder = SnapshotBuilder(microvm)
-    disks = [root_disk.local_path()]
-    # Create diff snapshot.
-    snapshot = snapshot_builder.create(disks,
-                                       ssh_key,
-                                       SnapshotType.FULL)
+
+    # Create snapshot.
+    snapshot = snapshot_builder.create(
+        [root_disk.local_path()], ssh_key, SnapshotType.FULL
+    )
     # Kill base microVM.
     microvm.kill()
 
     # Load microVM clone from snapshot.
-    test_microvm, _ = vm_builder.build_from_snapshot(snapshot,
-                                                     resume=True,
-                                                     diff_snapshots=False,
-                                                     daemonize=False)
+    test_microvm, _ = vm_builder.build_from_snapshot(
+        snapshot, resume=True, daemonize=False
+    )
     serial = Serial(test_microvm)
     serial.open()
     # We need to send a newline to signal the serial to flush