@@ -1,8 +1,19 @@
1+--- a/tests/basic-test.sh
2++++ b/tests/basic-test.sh
3+@@ -226,7 +226,7 @@ cd ${test_tmpdir}
4+ if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then
5+ fatal "committed non-bootable tree"
6+ fi
7+-assert_file_has_content err.txt "error: .*No such file or directory"
8++assert_file_has_content err.txt "error:.*No such file or directory"
9+ echo "ok commit fails bootable if no kernel"
10+
11+ cd ${test_tmpdir}
112diff --git a/tests/pull-test.sh b/tests/pull-test.sh
2−index a8bc49a9..4a08ebb5 100644
13+index f4084290..4af5ec6f 100644
314--- a/tests/pull-test.sh
415+++ b/tests/pull-test.sh
5−@@ -275,7 +275,7 @@
16+@@ -297,7 +297,7 @@ ostree_repo_init mirrorrepo-local --mode=archive
617 if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
718 fatal "pull with mixed refs succeeded?"
819 fi
@@ -11,7 +22,7 @@ index a8bc49a9..4a08ebb5 100644
1122 ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch
1223 ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch
1324 ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck
14−@@ -286,7 +286,7 @@
25+@@ -308,7 +308,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo nosuchbranc
1526 fatal "pulled nonexistent branch"
1627 fi
1728 # So true
@@ -20,7 +31,7 @@ index a8bc49a9..4a08ebb5 100644
2031 echo "ok pull-local nonexistent branch"
2132
2233 cd ${test_tmpdir}
23−@@ -593,5 +593,5 @@
34+@@ -687,5 +687,5 @@ rm ostree-srv/gnomerepo/summary
2435 if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
2536 fatal "pull of invalid ref succeeded"
2637 fi
@@ -28,10 +39,10 @@ index a8bc49a9..4a08ebb5 100644
2839+assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of'
2940 echo "ok pull got HTML for a ref"
3041diff --git a/tests/test-config.sh b/tests/test-config.sh
31−index 7e913d32..69d1675d 100755
42+index 2d9aaf53..f1e28614 100755
3243--- a/tests/test-config.sh
3344+++ b/tests/test-config.sh
34−@@ -46,7 +46,7 @@
45+@@ -44,7 +44,7 @@ assert_file_has_content list.txt "http://example\.com/ostree/repo/"
3546 if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then
3647 assert_not_reached "ostree config get should error out if too many arguments are given"
3748 fi
@@ -40,7 +51,7 @@ index 7e913d32..69d1675d 100755
4051 echo "ok config get"
4152
4253 ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only
43−@@ -63,7 +63,7 @@
54+@@ -61,7 +61,7 @@ assert_file_has_content repo/config "http://example\.com/ostree/"
4455 if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then
4556 assert_not_reached "ostree config set should error out if too many arguments are given"
4657 fi
@@ -48,8 +59,8 @@ index 7e913d32..69d1675d 100755
4859+assert_file_has_content err.txt "Too many arguments given"
4960 echo "ok config set"
5061
51− # Check that "ostree config unset" works
52−@@ -78,7 +78,7 @@
62+ # Check that using `--` works and that "ostree config unset" works
63+@@ -78,7 +78,7 @@ if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt;
5364 fi
5465 # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian
5566 # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839
@@ -58,7 +69,7 @@ index 7e913d32..69d1675d 100755
5869
5970 # Check that it's idempotent
6071 ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs
61−@@ -95,5 +95,5 @@
72+@@ -95,5 +95,5 @@ ${CMD_PREFIX} ostree config --repo=repo unset --group='remote "aoeuhtns"' 'xa.ti
6273 if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then
6374 assert_not_reached "ostree config unset should error out if too many arguments are given"
6475 fi
@@ -66,10 +77,10 @@ index 7e913d32..69d1675d 100755
6677+assert_file_has_content err.txt "Too many arguments given"
6778 echo "ok config unset"
6879diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
69−index dc6bcfeb..4a5eef55 100755
80+index 3dbcdd23..d6359979 100755
7081--- a/tests/test-fsck-collections.sh
7182+++ b/tests/test-fsck-collections.sh
72−@@ -100,7 +100,7 @@
83+@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree fsck --repo=repo
7384 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
7485 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
7586 fi
@@ -78,7 +89,7 @@ index dc6bcfeb..4a5eef55 100755
7889 assert_file_has_content fsck "^Validating refs\.\.\.$"
7990
8091 echo "ok 3 fsck detects missing ref bindings"
81−@@ -113,7 +113,7 @@
92+@@ -111,7 +111,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect
8293 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
8394 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
8495 fi
@@ -87,7 +98,7 @@ index dc6bcfeb..4a5eef55 100755
8798 assert_file_has_content fsck "^Validating refs\.\.\.$"
8899 assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
89100
90−@@ -127,7 +127,7 @@
101+@@ -125,7 +125,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect
91102 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
92103 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
93104 fi
@@ -96,7 +107,7 @@ index dc6bcfeb..4a5eef55 100755
96107 assert_file_has_content fsck "^Validating refs\.\.\.$"
97108 assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
98109
99−@@ -147,7 +147,7 @@
110+@@ -145,7 +145,7 @@ echo "ok 6 fsck ignores unreferenced ref bindings"
100111 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
101112 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
102113 fi
@@ -105,7 +116,7 @@ index dc6bcfeb..4a5eef55 100755
105116 assert_file_has_content fsck "^Validating refs\.\.\.$"
106117 assert_file_has_content fsck "^Validating refs in collections\.\.\.$"
107118
108−@@ -186,7 +186,7 @@
119+@@ -184,7 +184,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --create=new-ref $(cat ref3-checksum)
109120 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
110121 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
111122 fi
@@ -114,7 +125,7 @@ index dc6bcfeb..4a5eef55 100755
114125 assert_file_has_content fsck "^Validating refs\.\.\.$"
115126
116127 echo "ok 9 fsck detects missing ref bindings"
117−@@ -205,7 +205,7 @@
128+@@ -203,7 +203,7 @@ echo "ok 10 fsck ignores unreferenced ref bindings"
118129 if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
119130 assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
120131 fi
@@ -124,10 +135,10 @@ index dc6bcfeb..4a5eef55 100755
124135
125136 echo "ok 11 fsck ignores unreferenced ref bindings"
126137diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
127−index bb7eae89..62a3bcd7 100755
138+index 2f5ea634..0f63853c 100755
128139--- a/tests/test-remote-add.sh
129140+++ b/tests/test-remote-add.sh
130−@@ -83,7 +83,7 @@
141+@@ -81,7 +81,7 @@ echo "ok remote delete"
131142 if $OSTREE remote delete nosuchremote 2>err.txt; then
132143 assert_not_reached "Deleting remote unexpectedly succeeded"
133144 fi