test: Update composefs GC test

Now that we immediately remove unreferenced bootloader binaries, update
tests to test for the same

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Author: Johan-Liebert1

tmt/tests/booted/test-composefs-gc-uki.nu

@@ -41,16 +41,8 @@ def first_boot [] {
     bootc switch --transport containers-storage localhost/bootc-first
 
     # Find the large file's verity and save it
-    # nu has its own built in find which sucks, so we use the other one
-    # TODO: Replace this with some concrete API
-    # See: https://github.com/composefs/composefs-rs/pull/236
-    let file_path = (
-       /usr/bin/find /sysroot/composefs/objects -type f -size 1337k -newermt ($current_time | format date "%Y-%m-%d %H:%M:%S")
-        | xargs grep -lx "large-file-marker"
-    )
-
-    echo $file_path | save /var/large-file-marker-objpath
-    cat /var/large-file-marker-objpath
+    let path = bootc internals cfs dump-files $st.status.booted.composefs.verity /usr/share/large-test-file --backing-path-only | awk '{print $2}'
+    echo $"/sysroot/composefs/objects/($path)" | save /var/large-file-marker-objpath
 
     echo $st.status.booted.composefs.verity | save /var/boot0-verity
 
@@ -68,7 +60,7 @@ def second_boot [] {
     echo $st.status.booted.composefs.verity | save /var/boot1-verity
 
     let path = cat /var/large-file-marker-objpath
-
+    print $path
     assert ($path | path exists)
 
     mut containerfile = echo "
@@ -90,7 +82,7 @@ def third_boot [] {
     mount /dev/disk/by-partlabel/EFI-SYSTEM /var/tmp/efi
 
     assert equal $booted.image.image "localhost/bootc-second"
-    assert ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot0-verity).efi" | path exists)
+    assert (not ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot0-verity).efi" | path exists))
     assert ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot1-verity).efi" | path exists)
 
     echo $st.status.booted.composefs.verity | save /var/boot2-verity
@@ -119,8 +111,7 @@ def fourth_boot [] {
     mount /dev/disk/by-partlabel/EFI-SYSTEM /var/tmp/efi
 
     assert equal $booted.image.image "localhost/bootc-third"
-    assert (not ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot0-verity).efi" | path exists))
-    assert ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot1-verity).efi" | path exists)
+    assert (not ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot1-verity).efi" | path exists))
     assert ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot2-verity).efi" | path exists)
 
     echo $st.status.booted.composefs.verity | save /var/boot3-verity
@@ -138,29 +129,12 @@ def fourth_boot [] {
     tap ok
 }
 
-def fifth_boot [] {
-    mkdir /var/tmp/efi
-    mount /dev/disk/by-partlabel/EFI-SYSTEM /var/tmp/efi
-
-    assert equal $booted.image.image "localhost/bootc-final"
-
-    assert (not ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot1-verity).efi" | path exists))
-    assert ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot2-verity).efi" | path exists)
-    assert ($"/var/tmp/efi/EFI/Linux/bootc/($uki_prefix)(cat /var/boot3-verity).efi" | path exists)
-
-    # We had this in boot1 (second boot)
-    let path = cat /var/large-file-marker-objpath
-    assert (not ($path | path exists))
-    tap ok
-}
-
 def main [] {
     match $env.TMT_REBOOT_COUNT? {
         null | "0" => first_boot,
         "1" => second_boot,
         "2" => third_boot,
         "3" => fourth_boot,
-        "4" => fifth_boot,
         $o => { error make { msg: $"Invalid TMT_REBOOT_COUNT ($o)" } },
     }
 }

tmt/tests/booted/test-composefs-gc.nu

@@ -35,16 +35,8 @@ def first_boot [] {
     bootc switch --transport containers-storage localhost/bootc-derived
 
     # Find the large file's verity and save it
-    # nu has its own built in find which sucks, so we use the other one
-    # TODO: Replace this with some concrete API
-    # See: https://github.com/composefs/composefs-rs/pull/236
-    let file_path = (
-       /usr/bin/find /sysroot/composefs/objects -type f -size 1337k -newermt ($current_time | format date "%Y-%m-%d %H:%M:%S")
-        | xargs grep -lx "large-file-marker"
-    )
-
-    echo $file_path | save /var/large-file-marker-objpath
-    cat /var/large-file-marker-objpath
+    let path = bootc internals cfs dump-files $st.status.booted.composefs.verity /usr/share/large-test-file --backing-path-only | awk '{print $2}'
+    echo $"/sysroot/composefs/objects/($path)" | save /var/large-file-marker-objpath
 
     echo $st.status.booted.composefs.verity | save /var/first-verity
 
@@ -132,22 +124,6 @@ def third_boot [] {
 }
 
 def fourth_boot [] {
-    assert equal $booted.image.image "localhost/bootc-prefinal"
-
-    # Now we create a new image derived from the current kernel + initrd
-    # Switching to this and rebooting should remove the old kernel + initrd
-    echo "
-        FROM localhost/bootc-derived-initrd
-        RUN echo 'another file 1' > /usr/share/another-one-1
-    " | podman build -t localhost/bootc-final . -f -
-
-
-    bootc switch --transport containers-storage localhost/bootc-final
-
-    tmt-reboot
-}
-
-def fifth_boot [] {
     let bootloader = (bootc status --json | from json).status.booted.composefs.bootloader
 
     if ($bootloader | str downcase) == "systemd" {
@@ -177,7 +153,7 @@ def fifth_boot [] {
     tmt-reboot
 }
 
-def sixth_boot [i: int] {
+def fifth_boot [i: int] {
     assert equal $booted.image.image $"localhost/bootc-shared-($i)"
 
     # Just this being booted counts as success
@@ -201,10 +177,9 @@ def main [] {
         "1" => second_boot,
         "2" => third_boot,
         "3" => fourth_boot,
-        "4" => fifth_boot,
-        "5" => { sixth_boot 1 },
-        "6" => { sixth_boot 2 },
-        "7" => { sixth_boot 3 },
+        "4" => { fifth_boot 1 },
+        "5" => { fifth_boot 2 },
+        "6" => { fifth_boot 3 },
         $o => { error make { msg: $"Invalid TMT_REBOOT_COUNT ($o)" } },
     }
 }