Merge pull request #611 from cgwalters/test-opt

tests: Add an opt -> var/opt link

lib/src/fixture.rs

@@ -133,6 +133,7 @@ static OWNERS: Lazy<Vec<(Regex, &str)>> = Lazy::new(|| {
         ("usr/bin/hardlink.*", "testlink"),
         ("usr/etc/someconfig.conf", "someconfig"),
         ("usr/etc/polkit.conf", "a-polkit-config"),
+        ("opt", "filesystem"),
         ("usr/lib/pkgdb", "pkgdb"),
         ("usr/lib/sysimage/pkgdb", "pkgdb"),
     ]
@@ -164,11 +165,12 @@ r usr/lib/pkgdb/pkgdb some-package-database
 m
 d boot
 d run
+l opt var/opt
 m 0 0 1755
 d tmp
 "## };
 pub const CONTENTS_CHECKSUM_V0: &str =
-    "5e41de82f9f861fa51e53ce6dd640a260e4fb29b7657f5a3f14157e93d2c0659";
+    "f8c5c1ad93339fd6e928aec7819de79ecec4ec8a4d0cb3565bb1d127fd7f56db";
 // 1 for ostree commit, 2 for max frequency packages, 3 as empty layer
 pub const LAYERS_V0_LEN: usize = 3usize;
 pub const PKGS_V0_LEN: usize = 7usize;

lib/tests/it/main.rs

@@ -743,7 +743,7 @@ async fn test_container_chunked() -> Result<()> {
                 .created_by()
                 .as_ref()
                 .unwrap(),
-            "7 components"
+            "8 components"
         );
     }
     let import = imp.import(prep).await.context("Init pull derived").unwrap();
@@ -805,9 +805,9 @@ r usr/bin/bash bash-v0
     assert!(second.0.commit.is_none());
     assert_eq!(
         first.1,
-        "ostree export of commit 38ab1f9da373a0184b0b48db6e280076ab4b5d4691773475ae24825aae2272d4"
+        "ostree export of commit cc1180f8431dc5bd69172d9a9ded36038dc9449f7c6c48e7686c894e483bfb8a"
     );
-    assert_eq!(second.1, "7 components");
+    assert_eq!(second.1, "8 components");
 
     assert_eq!(store::list_images(fixture.destrepo()).unwrap().len(), 1);
     let n = store::count_layer_references(fixture.destrepo())? as i64;