chore(tests): implement /usr overlay tests

Signed-off-by: Robert Sturla <[email protected]>

Author: p5

lib/src/fixtures/spec-staged-booted-usrunlock.yaml renamed to lib/src/fixtures/spec-booted-usroverlay.yaml

@@ -9,22 +9,6 @@ spec:
     signature: insecure
   usrOverlay: readWrite
 status:
-  staged:
-    image:
-      image:
-        image: quay.io/example/someimage:latest
-        transport: registry
-        signature: insecure
-      architecture: arm64
-      version: nightly
-      # This one has nanoseconds, which should be dropped for human consumption
-      timestamp: 2023-10-14T19:22:15.42Z
-      imageDigest: sha256:16dc2b6256b4ff0d2ec18d2dbfb06d117904010c8cf9732cdb022818cf7a7566
-    incompatible: false
-    pinned: false
-    ostree:
-      checksum: 3c6dad657109522e0b2e49bf44b5420f16f0b438b5b9357e5132211cfbad135d
-      deploySerial: 0
   booted:
     image:
       image:
@@ -42,3 +26,4 @@ status:
       deploySerial: 0
   rollback: null
   isContainer: false
+  usrOverlay: readWrite

lib/src/lib.rs

@@ -18,6 +18,7 @@ pub(crate) mod kargs;
 mod lints;
 mod lsm;
 pub(crate) mod metadata;
+mod overlay;
 mod podman;
 mod progress_jsonl;
 mod reboot;
@@ -27,7 +28,6 @@ mod status;
 mod store;
 mod task;
 mod utils;
-mod overlay;
 
 #[cfg(feature = "docgen")]
 mod docgen;

lib/src/mount.rs

@@ -129,7 +129,7 @@ pub(crate) fn mount(dev: &str, target: &Utf8Path) -> Result<()> {
     )
 }
 
-pub(crate) fn unmount(target: &Utf8Path, lazy: bool) -> Result<()> {
+pub fn unmount(target: &Utf8Path, lazy: bool) -> Result<()> {
     let args = if lazy {
         vec!["-l", target.as_str()]
     } else {

lib/src/overlay.rs

@@ -8,7 +8,7 @@ use fn_error_context::context;
 use crate::spec;
 
 #[context("Setting /usr overlay")]
-pub(crate) fn set_usr_overlay(state: spec::FilesystemOverlay) -> Result<()> {
+pub fn set_usr_overlay(state: spec::FilesystemOverlay) -> Result<()> {
     match state {
         spec::FilesystemOverlay::Readonly => {
             tracing::info!("Setting /usr overlay to read-only");

lib/src/status.rs

@@ -421,7 +421,7 @@ fn human_render_imagestatus(
         // Only show the usr filesystem overlay state if we are booted and not the default
         // read-only mode.
         if slot == Slot::Booted && *usr_overlay != FilesystemOverlay::Readonly {
-            write_row_name(&mut out, "Usr overlay", prefix_len)?;
+            write_row_name(&mut out, "/usr overlay", prefix_len)?;
             writeln!(out, "{}", usr_overlay.to_human_string())?;
         }
     }
@@ -450,7 +450,7 @@ fn human_render_ostree(
         // Only show the usr filesystem overlay state if we are booted and not the default
         // read-only mode.
         if slot == Slot::Booted && *usr_overlay != FilesystemOverlay::Readonly {
-            write_row_name(&mut out, "Usr overlay", prefix_len)?;
+            write_row_name(&mut out, "/usr overlay", prefix_len)?;
             writeln!(out, "{}", usr_overlay.to_human_string())?;
         }
     }
@@ -612,4 +612,18 @@ mod tests {
             Some(ImageSignature::OstreeRemote("fedora".into()))
         );
     }
+
+    #[test]
+    fn test_human_readable_booted_usroverlay() {
+        let w =
+            human_status_from_spec_fixture(include_str!("fixtures/spec-booted-usroverlay.yaml"))
+                .unwrap();
+        let expected = indoc::indoc! { r"
+          ● Booted image: quay.io/example/someimage:latest
+                  Digest: sha256:736b359467c9437c1ac915acaae952aad854e07eb4a16a94999a48af08c83c34 (arm64)
+                 Version: nightly (2023-09-30T19:22:16Z)
+            /usr overlay: read-write
+        "};
+        similar_asserts::assert_eq!(w, expected);
+    }
 }