Added basic, incomplete tests for hibernate/resume

builds successfully, but still need to figure out why qemu fails

Author: truffle0

src/ugrd/base/test.toml

@@ -2,14 +2,16 @@ test_rootfs_name = 'ugrd-test-rootfs'
 test_rootfs_build_dir = 'initramfs_test_rootfs'
 test_image_size = 16
 
-test_copy_config = ["_mounts", "mounts", "out_dir", "tmpdir", "clean", "test_image_size", "test_flag", "cryptsetup"]
+test_copy_config = ["mounts", "out_dir", "tmpdir", "clean", "test_image_size", "test_flag", "cryptsetup"]
+kmod_init = ["ata_piix", "sd_mod"]
 
 test_memory = '256M'
 test_cpu = 'host'
 test_arch = 'x86_64'
 test_timeout = 15
 test_cmdline = 'console=ttyS0,115200 panic=1'
-qemu_bool_args = ['nographic', 'no-reboot', 'enable-kvm']
+#qemu_bool_args = ['nographic', 'no-reboot', 'enable-kvm']
+qemu_bool_args = ['nographic', 'enable-kvm' ]
 
 [imports.build_pre]
 "ugrd.base.test" = [ "init_test_vars" ]

src/ugrd/fs/resume.py

@@ -62,3 +62,13 @@ def handle_early_resume(self) -> None:
 def handle_late_resume(self) -> None:
     self.logger.warning("[late_resume] enabled, this can result in data loss if filesystems are modified before resuming. Read the docs for more info.")
     return handle_early_resume(self)  # At the moment it's the same code but delayed, will change when more features are added
+
+@contains("test_resume")
+def test_init_swap_uuid(self):
+    if "test_cpu" in self:
+        from uuid import uuid4
+        self["test_swap_uuid"] = swap_uuid = uuid4()
+        
+        # append to test kernel cmdline and adjust planned image size to allow enough space
+        self["test_cmdline"] = f'{self.get("test_cmdline")} resume=UUID={swap_uuid}'
+        self["test_image_size"] = 256 + self.get("test_image_size")

src/ugrd/fs/resume.toml

@@ -1,5 +1,9 @@
 cmdline_strings = [ "resume" ]
 binaries = [ 'lsblk' ]
+test_copy_config = [ "test_resume", "test_swap_uuid" ]
+
+[imports.build_pre]
+"ugrd.fs.resume" = [ "test_init_swap_uuid" ]
 
 [imports.init_main] 
 "ugrd.fs.resume" = [ "handle_early_resume" ]
@@ -12,7 +16,8 @@ binaries = [ 'lsblk' ]
 
 [custom_parameters]
 late_resume = "bool"
+test_resume = "bool"
+test_swap_uuid = "str"
 
 [import_order.before]
 handle_resume = "mount_fstab"
-

src/ugrd/fs/test_image.toml

@@ -9,6 +9,12 @@ _cryptsetup_root = "root"
 [imports.build_pre]
 "ugrd.fs.test_image" = ["init_banner"]
 
+[imports.init_main]
+"ugrd.fs.test_image" = ["resume_tests"]
+
+[imports.init_final]
+"ugrd.fs.test_image" = ["complete_tests"]
+
 [imports.pack]
 "ugrd.fs.test_image" = ["make_test_image"]
 
@@ -20,4 +26,4 @@ cryptsetup = "dict"  # Same as above
 _cryptsetup_root = "str"  # Define the root device for cryptsetup
 test_image_size = "int"  # Define the size of the test image in MiB
 test_flag = "str"  # Define the success flag used to determine if the test was successful
-
+test_resume = "bool" # Enable code to test the suspend/resume pathways