Skip to content

Commit 857f8d1

Browse files
authored
Merge pull request bootc-dev#611 from cgwalters/test-opt
tests: Add an opt -> var/opt link
2 parents 11de308 + 4d10a2c commit 857f8d1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

lib/src/fixture.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ static OWNERS: Lazy<Vec<(Regex, &str)>> = Lazy::new(|| {
133133
("usr/bin/hardlink.*", "testlink"),
134134
("usr/etc/someconfig.conf", "someconfig"),
135135
("usr/etc/polkit.conf", "a-polkit-config"),
136+
("opt", "filesystem"),
136137
("usr/lib/pkgdb", "pkgdb"),
137138
("usr/lib/sysimage/pkgdb", "pkgdb"),
138139
]
@@ -164,11 +165,12 @@ r usr/lib/pkgdb/pkgdb some-package-database
164165
m
165166
d boot
166167
d run
168+
l opt var/opt
167169
m 0 0 1755
168170
d tmp
169171
"## };
170172
pub const CONTENTS_CHECKSUM_V0: &str =
171-
"5e41de82f9f861fa51e53ce6dd640a260e4fb29b7657f5a3f14157e93d2c0659";
173+
"f8c5c1ad93339fd6e928aec7819de79ecec4ec8a4d0cb3565bb1d127fd7f56db";
172174
// 1 for ostree commit, 2 for max frequency packages, 3 as empty layer
173175
pub const LAYERS_V0_LEN: usize = 3usize;
174176
pub const PKGS_V0_LEN: usize = 7usize;

lib/tests/it/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ async fn test_container_chunked() -> Result<()> {
743743
.created_by()
744744
.as_ref()
745745
.unwrap(),
746-
"7 components"
746+
"8 components"
747747
);
748748
}
749749
let import = imp.import(prep).await.context("Init pull derived").unwrap();
@@ -805,9 +805,9 @@ r usr/bin/bash bash-v0
805805
assert!(second.0.commit.is_none());
806806
assert_eq!(
807807
first.1,
808-
"ostree export of commit 38ab1f9da373a0184b0b48db6e280076ab4b5d4691773475ae24825aae2272d4"
808+
"ostree export of commit cc1180f8431dc5bd69172d9a9ded36038dc9449f7c6c48e7686c894e483bfb8a"
809809
);
810-
assert_eq!(second.1, "7 components");
810+
assert_eq!(second.1, "8 components");
811811

812812
assert_eq!(store::list_images(fixture.destrepo()).unwrap().len(), 1);
813813
let n = store::count_layer_references(fixture.destrepo())? as i64;

0 commit comments

Comments
 (0)