Skip to content

Commit 83ea13e

Browse files
committed
fixup: Remove duplicate tests and fix escaping expectations after rebase
During the rebase of the sealing-impl branch onto main, some test functions that existed in both the PR and main (from cherry-picks) ended up duplicated. This removes the sync duplicates in favor of main's async versions in repository.rs, removes duplicate CLI integration tests, fixes a dumpfile escape expectation (named escapes vs hex escapes), and adds a missing import in privileged.rs.
1 parent 90d684a commit 83ea13e

4 files changed

Lines changed: 5 additions & 834 deletions

File tree

crates/composefs-oci/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -950,9 +950,9 @@ mod test {
950950
"\
951951
/ 0 40755 6 0 0 0 0.0 - - -
952952
/etc 0 40755 2 0 0 0 0.0 - - -
953-
/etc/hostname 9 100644 1 0 0 0 0.0 - testhost\\x0a -
954-
/etc/os-release 23 100644 1 0 0 0 0.0 - ID\\x3dtest\\x0aVERSION_ID\\x3d1.0\\x0a -
955-
/etc/passwd 34 100644 1 0 0 0 0.0 - root:x:0:0:root:/root:/usr/bin/sh\\x0a -
953+
/etc/hostname 9 100644 1 0 0 0 0.0 - testhost\\n -
954+
/etc/os-release 23 100644 1 0 0 0 0.0 - ID=test\\nVERSION_ID=1.0\\n -
955+
/etc/passwd 34 100644 1 0 0 0 0.0 - root:x:0:0:root:/root:/usr/bin/sh\\n -
956956
/tmp 0 40755 2 0 0 0 0.0 - - -
957957
/usr 0 40755 5 0 0 0 0.0 - - -
958958
/usr/bin 0 40755 2 0 0 0 0.0 - - -
@@ -961,7 +961,7 @@ mod test {
961961
/usr/bin/cp 7 120777 1 0 0 0 0.0 busybox - -
962962
/usr/bin/ls 7 120777 1 0 0 0 0.0 busybox - -
963963
/usr/bin/mv 7 120777 1 0 0 0 0.0 busybox - -
964-
/usr/bin/myapp 25 100755 1 0 0 0 0.0 - #!/usr/bin/sh\\x0aecho\\x20hello\\x0a -
964+
/usr/bin/myapp 25 100755 1 0 0 0 0.0 - #!/usr/bin/sh\\necho\\x20hello\\n -
965965
/usr/bin/rm 7 120777 1 0 0 0 0.0 busybox - -
966966
/usr/bin/sh 7 120777 1 0 0 0 0.0 busybox - -
967967
/usr/lib 0 40755 2 0 0 0 0.0 - - -

0 commit comments

Comments
 (0)