fixed up posix compliance & attempted to clean up variables

- converted `test_cmdline` to a NoDupFlatList to allow modules to append
  parameters more easily

- made script in `test_resume` posix compliant, removed use of "local",
  "source" and (technically compliant, but not universally supported)
  redirects

- attempted to clean up test-specific variables that are appended to by
  the resume module.

Author: truffle0

src/ugrd/base/test.py

@@ -55,7 +55,7 @@ def _get_qemu_cmd_args(self, test_image):
         "-cpu": self["test_cpu"],
         "-kernel": self["test_kernel"],
         "-initrd": test_initrd,
-        "-append": self["test_cmdline"],
+        "-append": " ".join(self["test_cmdline"]),
         "-drive": "file=%s,format=raw" % test_rootfs,
     }
 
@@ -86,7 +86,7 @@ def make_test_image(self):
         "validate": False,
         "NO_BASE": True,
         "config": None,
-        "modules": ','.join(self["test_modules"]), # By default is only "ugrd.fs.test_image"
+        "modules": ",".join(self["test_modules"]),  # By default is only "ugrd.fs.test_image"
         "out_file": self["test_rootfs_name"],
         "build_dir": self["test_rootfs_build_dir"],
         "custom_parameters": get_copy_config_types(self),

src/ugrd/base/test.toml

@@ -9,7 +9,7 @@ test_memory = '256M'
 test_cpu = 'host'
 test_arch = 'x86_64'
 test_timeout = 30
-test_cmdline = 'console=ttyS0,115200 panic=0'
+test_cmdline = ['console=ttyS0,115200', 'panic=0']
 test_modules = [ "ugrd.fs.test_image" ]
 qemu_bool_args = ['nographic', 'enable-kvm' ]
 
@@ -24,7 +24,7 @@ test_kernel = "Path"  # Define the kernel to use for the test
 test_memory = "str"  # Define the amount of memory to use for the test image (passed to qemu)
 test_cpu = "str"  # Define the CPU to use for the test image (passed to qemu)
 test_arch = "str"  # Define the qemu arch (added to the qemu-system- command)
-test_cmdline = "str"  # Define the kernel command line for the test image
+test_cmdline = "NoDupFlatList"  # Define the kernel command line for the test image
 test_timeout = "int"  # Define the timeout for the test
 test_image_size = "int"  # Define the size of the test image, in MB
 test_flag = "str"  # Define the success flag for the test

src/ugrd/fs/resume.py

@@ -3,6 +3,22 @@
 from zenlib.util import contains
 
 
+@contains("test_resume")
+def setup_resume_tests(self) -> None:
+    if "ugrd.base.test" in self["modules"]:
+        from uuid import uuid4
+
+        # Create a uuid for the swap partition in the test image
+        if not self["test_swap_uuid"]:
+            self["test_swap_uuid"] = uuid4()
+
+        # pull in the hibernation/resume testing module
+        self["test_modules"] = "ugrd.fs.test_resume"
+
+        # append resume partition to QEMU kernel cmdline
+        self["test_cmdline"] = f"resume=UUID={self['test_swap_uuid']}"
+
+
 def resume(self) -> str:
     """Returns a shell script handling resume from hibernation.
     Checks that /sys/power/resume is writable, resume= is set, and noresume is not set, if so,
@@ -30,8 +46,7 @@ def resume(self) -> str:
 
         [ -b "$1" ] || (ewarn "\'$1\' is not a valid block device!" ; return 1)
         einfo "Attempting resume from: $1"
-        # TODO: This could maybe be printf?
-        echo -n "$1" > /sys/power/resume
+        printf "%s" "$1" > /sys/power/resume
         einfo "No image on: $resume"
         return 0
     """
@@ -70,17 +85,3 @@ def handle_late_resume(self) -> None:
 
     # At the moment it's the same code but delayed, will change when more features are added
     return handle_early_resume(self)
-
-@contains("test_resume")
-def test_resume_setup(self) -> None:
-    if "ugrd.base.test" in self["modules"]:
-        # Add resume to the list of test modules
-        self["test_modules"] = "ugrd.fs.test_resume"
-        
-        # Create a uuid for the swap partition in the test image
-        from uuid import uuid4
-        if not self["test_swap_uuid"]:
-            self["test_swap_uuid"] = swap_uuid = uuid4()
-
-        # append to QEMU kernel cmdline
-        self["test_cmdline"] = f"{self.get('test_cmdline')} resume=UUID={swap_uuid}"

src/ugrd/fs/resume.toml

@@ -3,7 +3,7 @@ binaries = [ 'lsblk' ]
 test_copy_config = [ "test_resume", "test_swap_uuid" ]
 
 [imports.build_pre]
-"ugrd.fs.resume" = [ "test_resume_setup" ]
+"ugrd.fs.resume" = [ "setup_resume_tests" ]
 
 [imports.init_main]
 "ugrd.fs.resume" = [ "handle_early_resume", "handle_late_resume"]
@@ -15,9 +15,9 @@ handle_early_resume = "mount_fstab"
 handle_late_resume = ["crypt_init", "init_lvm"]
 
 [imports.functions]
-"ugrd.fs.resume" = ["resume"]
+"ugrd.fs.resume" = [ "resume" ]
 
 [custom_parameters]
-late_resume = "bool"
+late_resume = "bool"  # Include code for late resume
 test_resume = "bool" # Test hibernation/resume pathways when test is enabled
-test_swap_uuid = "str" # Define the uuid of the swap partition on the test image
+test_swap_uuid = "str"  # Define the uuid of the swap partition on the test image

src/ugrd/fs/test_image.py

@@ -144,7 +144,7 @@ def make_test_image(self):
 
             image_path = f"{loopback}p2"
         except RuntimeError as e:
-            self._run(["losetup", "-d", loopback])   # Free loopback device on fail
+            self._run(["losetup", "-d", loopback])  # Free loopback device on fail
             raise RuntimeError("Failed to allocate loopback device for disk creation: %s", e)
 
         # sleep for 100ms, to give the loopback device time to scan for partitions

src/ugrd/fs/test_resume.py

@@ -2,6 +2,7 @@
 
 from zenlib.util import contains
 
+
 @contains("test_resume")
 def resume_tests(self):
     return """
@@ -10,9 +11,8 @@ def resume_tests(self):
             echo reboot > /sys/power/disk
             echo 1 > /sys/power/pm_debug_messages
 
-            local SWAPDEV=/dev/$(source "/sys/dev/block/$(</sys/power/resume)/uevent" && echo $DEVNAME)
-            echo "Activating swap device ${SWAPDEV}..."
-            swapon ${SWAPDEV}
+            echo "Activating hibernation swap device..."
+            swapon /dev/$(. "/sys/dev/block/$(read blk </sys/power/resume && echo $blk)/uevent" && echo $DEVNAME)
 
             echo "Triggering test hibernation..."
             echo disk > /sys/power/state || (echo "Suspend to disk failed!" ; echo c > /proc/sysrq-trigger)

src/ugrd/fs/test_resume.toml

@@ -1,2 +1,5 @@
 [imports.init_main]
 "ugrd.fs.test_resume" = ["resume_tests"]
+
+[custom_parameters]
+test_resume = "bool"