diff --git a/test/functional/update/apply-full-file-delta/test.bats b/test/functional/update/apply-full-file-delta/test.bats index 82e7db2e..fb16333b 100755 --- a/test/functional/update/apply-full-file-delta/test.bats +++ b/test/functional/update/apply-full-file-delta/test.bats @@ -41,9 +41,9 @@ teardown() { [ "${lines[9]}" = "Downloading os-core pack for version 100" ] [ "${lines[10]}" = "Extracting pack." ] [ "${lines[11]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[12]}" = " changed manifests : 1" ] - [ "${lines[13]}" = " new manifests : 0" ] - [ "${lines[14]}" = " deleted manifests : 0" ] + [ "${lines[12]}" = " changed bundles : 1" ] + [ "${lines[13]}" = " new bundles : 0" ] + [ "${lines[14]}" = " deleted bundles : 0" ] [ "${lines[15]}" = " changed files : 1" ] [ "${lines[16]}" = " new files : 0" ] [ "${lines[17]}" = " deleted files : 0" ] diff --git a/test/functional/update/boot-file/test.bats b/test/functional/update/boot-file/test.bats index c3190dd1..c82969c4 100755 --- a/test/functional/update/boot-file/test.bats +++ b/test/functional/update/boot-file/test.bats @@ -36,9 +36,9 @@ teardown() { ignore_sigverify_error 10 [ "${lines[10]}" = "Downloading os-core pack for version 100" ] [ "${lines[11]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[12]}" = " changed manifests : 1" ] - [ "${lines[13]}" = " new manifests : 0" ] - [ "${lines[14]}" = " deleted manifests : 0" ] + [ "${lines[12]}" = " changed bundles : 1" ] + [ "${lines[13]}" = " new bundles : 0" ] + [ "${lines[14]}" = " deleted bundles : 0" ] [ "${lines[15]}" = " changed files : 0" ] [ "${lines[16]}" = " new files : 1" ] [ "${lines[17]}" = " deleted files : 0" ] diff --git a/test/functional/update/download/test.bats b/test/functional/update/download/test.bats index 1b115966..043bbd4c 100755 --- a/test/functional/update/download/test.bats +++ b/test/functional/update/download/test.bats @@ -37,9 +37,9 @@ teardown() { [ "${lines[9]}" = "Downloading os-core pack for version 100" ] [ "${lines[10]}" = "Extracting pack." ] [ "${lines[11]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[12]}" = " changed manifests : 1" ] - [ "${lines[13]}" = " new manifests : 0" ] - [ "${lines[14]}" = " deleted manifests : 0" ] + [ "${lines[12]}" = " changed bundles : 1" ] + [ "${lines[13]}" = " new bundles : 0" ] + [ "${lines[14]}" = " deleted bundles : 0" ] [ "${lines[15]}" = " changed files : 1" ] [ "${lines[16]}" = " new files : 0" ] [ "${lines[17]}" = " deleted files : 0" ] diff --git a/test/functional/update/include-old-bundle-with-tracked-file/test.bats b/test/functional/update/include-old-bundle-with-tracked-file/test.bats index 0086a989..dd5eafe1 100755 --- a/test/functional/update/include-old-bundle-with-tracked-file/test.bats +++ b/test/functional/update/include-old-bundle-with-tracked-file/test.bats @@ -58,19 +58,22 @@ teardown() { [ "${lines[10]}" = "Downloading test-bundle2 pack for version 30" ] [ "${lines[11]}" = "Downloading test-bundle3 pack for version 30" ] [ "${lines[12]}" = "Statistics for going from version 20 to version 30:" ] - [ "${lines[13]}" = " changed manifests : 3" ] - [ "${lines[14]}" = " new manifests : 0" ] - [ "${lines[15]}" = " deleted manifests : 0" ] - [ "${lines[16]}" = " changed files : 2" ] -# FIXME not detecting new files from includes - [ "${lines[17]}" = " new files : 0" ] + [ "${lines[13]}" = " changed bundles : 3" ] + [ "${lines[14]}" = " new bundles : 0" ] + [ "${lines[15]}" = " deleted bundles : 0" ] + [ "${lines[16]}" = " changed files : 1" ] + [ "${lines[17]}" = " new files : 1" ] [ "${lines[18]}" = " deleted files : 0" ] [ "${lines[19]}" = "Starting download of remaining update content. This may take a while..." ] [ "${lines[20]}" = "Finishing download of update content..." ] [ "${lines[21]}" = "Staging file content" ] [ "${lines[22]}" = "Update was applied." ] [ "${lines[26]}" = "Update successful. System updated from version 20 to version 30" ] + + # changed file [ -f "$DIR/target-dir/os-core" ] + + # new file [ -f "$DIR/target-dir/tracked-file" ] } diff --git a/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.MoM b/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.MoM index 46bd8841..71c1e326 100644 --- a/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.MoM +++ b/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.MoM @@ -6,6 +6,6 @@ timestamp: 1451940175 contentsize: 13805671819 M... 3a93b49b962874fc6c667f1844aef3fb5508fde5df3bdf71fef71de21acc1d37 10 test-bundle1 -M... 8f094b394057dd85b77e0c3b13337a226a52e2b7d163a63c5a6809a6b201229a 30 test-bundle2 -M... b1819193785763d88def3f6fc1bbc6374e4b23c8f5d064df5c5d2fb36f95ceb3 30 test-bundle3 +M... 692b27fa22c01d0d513020a7b2e381e9bf8f8fabaf29bf6dd0023fe178c9ee11 30 test-bundle2 +M... 0f66afd9535a1ac74f35b080cbecd5836528b26024d2d73c18bb3b27a42206dd 30 test-bundle3 M... 426e8b2ed2054421880ca41c5ac05aaf29337a1a42eea93ba11cd09b621f3e66 30 os-core diff --git a/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle2 b/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle2 index 3af20c3f..3bc25e2a 100644 --- a/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle2 +++ b/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle2 @@ -7,4 +7,4 @@ contentsize: 17929151 includes: os-core includes: test-bundle1 -F... a96e0b959874854750e8e08372e62c4d1821c5e0106694365396d02c363ada50 10 /test-bundle2 +F... dead85caf9cf95df0f721254748df4717b4159513a3e0170ff5fa404dccc32e7 10 /test-bundle2 diff --git a/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle3 b/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle3 index 1f99c90c..45aa362b 100644 --- a/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle3 +++ b/test/functional/update/include-old-bundle-with-tracked-file/web-dir/30/Manifest.test-bundle3 @@ -6,5 +6,5 @@ timestamp: 1451936779 contentsize: 17929151 includes: os-core -F... a96e0b959874854750e8e08372e62c4d1821c5e0106694365396d02c363ada50 10 /test-bundle3 +F... dead0b959874854750e8e08372e62c4d1821c5e0106694365396d02c363ada50 10 /test-bundle3 F... e324302d81e79a935137bd4ed6ab6c6792aa6d4356c9c227342eaa0db015c152 30 /tracked-file diff --git a/test/functional/update/include-old-bundle/test.bats b/test/functional/update/include-old-bundle/test.bats index 937c90d5..96d8f4d6 100755 --- a/test/functional/update/include-old-bundle/test.bats +++ b/test/functional/update/include-old-bundle/test.bats @@ -53,20 +53,23 @@ teardown() { [ "${lines[9]}" = "Downloading os-core pack for version 100" ] [ "${lines[10]}" = "Downloading test-bundle1 pack for version 100" ] [ "${lines[11]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[12]}" = " changed manifests : 2" ] - [ "${lines[13]}" = " new manifests : 0" ] - [ "${lines[14]}" = " deleted manifests : 0" ] + [ "${lines[12]}" = " changed bundles : 2" ] + [ "${lines[13]}" = " new bundles : 0" ] + [ "${lines[14]}" = " deleted bundles : 0" ] [ "${lines[15]}" = " changed files : 2" ] -# FIXME not detecting new files from includes - [ "${lines[16]}" = " new files : 0" ] + [ "${lines[16]}" = " new files : 1" ] [ "${lines[17]}" = " deleted files : 0" ] [ "${lines[18]}" = "Starting download of remaining update content. This may take a while..." ] [ "${lines[19]}" = "Finishing download of update content..." ] [ "${lines[20]}" = "Staging file content" ] [ "${lines[21]}" = "Update was applied." ] [ "${lines[25]}" = "Update successful. System updated from version 10 to version 100" ] + + # changed files [ -f "$DIR/target-dir/os-core" ] [ -f "$DIR/target-dir/test-bundle1" ] + + # new file [ -f "$DIR/target-dir/test-bundle2" ] } diff --git a/test/functional/update/include/test.bats b/test/functional/update/include/test.bats index a92ab40d..7e274e3a 100755 --- a/test/functional/update/include/test.bats +++ b/test/functional/update/include/test.bats @@ -80,20 +80,23 @@ teardown() { [ "${lines[15]}" = "Downloading os-core pack for version 100" ] [ "${lines[16]}" = "Downloading test-bundle1 pack for version 100" ] [ "${lines[17]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[18]}" = " changed manifests : 3" ] - [ "${lines[19]}" = " new manifests : 0" ] - [ "${lines[20]}" = " deleted manifests : 0" ] - [ "${lines[21]}" = " changed files : 3" ] -# FIXME not detecting new files from includes - [ "${lines[22]}" = " new files : 0" ] + [ "${lines[18]}" = " changed bundles : 2" ] + [ "${lines[19]}" = " new bundles : 6" ] + [ "${lines[20]}" = " deleted bundles : 0" ] + [ "${lines[21]}" = " changed files : 2" ] + [ "${lines[22]}" = " new files : 6" ] [ "${lines[23]}" = " deleted files : 0" ] [ "${lines[24]}" = "Starting download of remaining update content. This may take a while..." ] [ "${lines[25]}" = "Finishing download of update content..." ] [ "${lines[26]}" = "Staging file content" ] [ "${lines[27]}" = "Update was applied." ] [ "${lines[31]}" = "Update successful. System updated from version 10 to version 100" ] + + # changed files [ -d "$DIR/target-dir/usr/bin" ] [ -f "$DIR/target-dir/usr/core" ] + + # new files [ -f "$DIR/target-dir/usr/foo2" ] [ -f "$DIR/target-dir/usr/foo3" ] [ -f "$DIR/target-dir/usr/foo4" ] diff --git a/test/functional/update/missing-os-core/test.bats b/test/functional/update/missing-os-core/test.bats index e5412616..07de7e5b 100755 --- a/test/functional/update/missing-os-core/test.bats +++ b/test/functional/update/missing-os-core/test.bats @@ -22,6 +22,7 @@ teardown() { clean_tars 100 clean_tars 100 files revert_chown_root "$DIR/web-dir/100/files/$f1" + sudo rmdir "$DIR/target-dir/os-core" sudo rmdir "$DIR/target-dir/usr/bin" } @@ -41,10 +42,10 @@ teardown() { [ "${lines[9]}" = "Downloading os-core pack for version 100" ] [ "${lines[10]}" = "Downloading test-bundle1 pack for version 100" ] [ "${lines[11]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[12]}" = " changed manifests : 2" ] - [ "${lines[13]}" = " new manifests : 0" ] - [ "${lines[14]}" = " deleted manifests : 0" ] - [ "${lines[15]}" = " changed files : 0" ] + [ "${lines[12]}" = " changed bundles : 2" ] + [ "${lines[13]}" = " new bundles : 0" ] + [ "${lines[14]}" = " deleted bundles : 0" ] + [ "${lines[15]}" = " changed files : 2" ] [ "${lines[16]}" = " new files : 0" ] [ "${lines[17]}" = " deleted files : 0" ] [ "${lines[18]}" = "Starting download of remaining update content. This may take a while..." ] @@ -52,6 +53,9 @@ teardown() { [ "${lines[20]}" = "Staging file content" ] [ "${lines[21]}" = "Update was applied." ] [ "${lines[25]}" = "Update successful. System updated from version 10 to version 100" ] + + # changed files (hashes didn't change, only the versions) + [ -d "$DIR/target-dir/os-core" ] [ -d "$DIR/target-dir/usr/bin" ] } diff --git a/test/functional/update/missing-os-core/web-dir/10/Manifest.MoM b/test/functional/update/missing-os-core/web-dir/10/Manifest.MoM index 0cdcc45f..f0e22048 100644 --- a/test/functional/update/missing-os-core/web-dir/10/Manifest.MoM +++ b/test/functional/update/missing-os-core/web-dir/10/Manifest.MoM @@ -5,5 +5,5 @@ filecount: 1 timestamp: 1451940175 contentsize: 13805671819 -M... 624af832ff42f0b0592817db4b1bff9672d791592961605cf6e8dc8f5badf4e0 10 os-core +M... e9462e2b7e5b852bc19bda5f241ffaa4fecceec0ef89a3f0d3d4a66e31bb1a5e 10 os-core M... 1bf200ad0db7009656842c8b1751be4b6b4e3956d7a53065d45e289356792cb1 10 test-bundle1 diff --git a/test/functional/update/missing-os-core/web-dir/10/Manifest.os-core b/test/functional/update/missing-os-core/web-dir/10/Manifest.os-core index dfb192ab..dd080d54 100644 --- a/test/functional/update/missing-os-core/web-dir/10/Manifest.os-core +++ b/test/functional/update/missing-os-core/web-dir/10/Manifest.os-core @@ -5,4 +5,4 @@ filecount: 1 timestamp: 1451936779 contentsize: 17929151 -D... 11251b2c86785c8f5a9328b372e42f9356bd6d1dd2ef4dcf431b8999b31c2e26 10 /usr/bin +D... 6c27df6efcd6fc401ff1bc67c970b83eef115f6473db4fb9d57e5de317eba96e 10 /os-core diff --git a/test/functional/update/missing-os-core/web-dir/100/Manifest.MoM b/test/functional/update/missing-os-core/web-dir/100/Manifest.MoM index 9ced4016..fd17b9a3 100644 --- a/test/functional/update/missing-os-core/web-dir/100/Manifest.MoM +++ b/test/functional/update/missing-os-core/web-dir/100/Manifest.MoM @@ -5,5 +5,5 @@ filecount: 1 timestamp: 1451940175 contentsize: 13805671819 -M... 26e45e3e60cf47097f2ff2f5b41ba9512bc3793b5351a60a9fe49ea80fd4b5fe 100 os-core +M... a7fdf10d1bbac1a82f1b0fea299e6df6841093ff47c084a95f3809b40b5b846a 100 os-core M... 26e45e3e60cf47097f2ff2f5b41ba9512bc3793b5351a60a9fe49ea80fd4b5fe 100 test-bundle1 diff --git a/test/functional/update/missing-os-core/web-dir/100/Manifest.os-core b/test/functional/update/missing-os-core/web-dir/100/Manifest.os-core index fd0680b1..f5f8cbed 100644 --- a/test/functional/update/missing-os-core/web-dir/100/Manifest.os-core +++ b/test/functional/update/missing-os-core/web-dir/100/Manifest.os-core @@ -5,4 +5,4 @@ filecount: 1 timestamp: 1451936779 contentsize: 17929151 -D... 6c27df6efcd6fc401ff1bc67c970b83eef115f6473db4fb9d57e5de317eba96e 100 /usr/bin +D... 6c27df6efcd6fc401ff1bc67c970b83eef115f6473db4fb9d57e5de317eba96e 100 /os-core diff --git a/test/functional/update/newest-deleted/test.bats b/test/functional/update/newest-deleted/test.bats index ee7aa8e3..75a81db6 100755 --- a/test/functional/update/newest-deleted/test.bats +++ b/test/functional/update/newest-deleted/test.bats @@ -46,9 +46,9 @@ teardown() { [ "${lines[10]}" = "Extracting pack." ] [ "${lines[11]}" = "Downloading test-bundle2 pack for version 30" ] [ "${lines[12]}" = "Statistics for going from version 20 to version 30:" ] - [ "${lines[13]}" = " changed manifests : 2" ] - [ "${lines[14]}" = " new manifests : 0" ] - [ "${lines[15]}" = " deleted manifests : 0" ] + [ "${lines[13]}" = " changed bundles : 2" ] + [ "${lines[14]}" = " new bundles : 0" ] + [ "${lines[15]}" = " deleted bundles : 0" ] [ "${lines[16]}" = " changed files : 1" ] [ "${lines[17]}" = " new files : 0" ] [ "${lines[18]}" = " deleted files : 1" ] diff --git a/test/functional/update/skip-verified-fullfiles/test.bats b/test/functional/update/skip-verified-fullfiles/test.bats index b34a7bf6..d3cbb3b4 100755 --- a/test/functional/update/skip-verified-fullfiles/test.bats +++ b/test/functional/update/skip-verified-fullfiles/test.bats @@ -33,10 +33,10 @@ teardown() { ignore_sigverify_error 9 [ "${lines[9]}" = "Downloading test-bundle pack for version 100" ] [ "${lines[10]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[11]}" = " changed manifests : 1" ] - [ "${lines[12]}" = " new manifests : 0" ] - [ "${lines[13]}" = " deleted manifests : 0" ] - [ "${lines[14]}" = " changed files : 0" ] + [ "${lines[11]}" = " changed bundles : 1" ] + [ "${lines[12]}" = " new bundles : 0" ] + [ "${lines[13]}" = " deleted bundles : 0" ] + [ "${lines[14]}" = " changed files : 1" ] [ "${lines[15]}" = " new files : 0" ] [ "${lines[16]}" = " deleted files : 0" ] [ "${lines[17]}" = "Starting download of remaining update content. This may take a while..." ] @@ -44,6 +44,9 @@ teardown() { [ "${lines[19]}" = "Staging file content" ] [ "${lines[20]}" = "Update was applied." ] [ "${lines[24]}" = "Update successful. System updated from version 10 to version 100" ] + + # changed file (hash is the same, but version changed) + [ -f "$DIR/target-dir/foo" ] } # vi: ft=sh ts=8 sw=2 sts=2 et tw=80 diff --git a/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.MoM b/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.MoM index 35ad7e8d..b84af794 100644 --- a/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.MoM +++ b/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.MoM @@ -6,4 +6,4 @@ timestamp: 1451940175 contentsize: 13805671819 M... 1d951049819a561cafa046f5350511d6a132f0e821c342ebe23908911888d01f 10 os-core -M... 8900e3b5d1bf1a4646e31599bab5f1a9540177b8f13fa3be6df35242d3b544f1 10 test-bundle +M... 0f4d9003471699f2660bb424fac09618d6679d659ce6b471622a440410c9cd8c 10 test-bundle diff --git a/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.test-bundle b/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.test-bundle index d0c7bc52..a84e2b65 100644 --- a/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.test-bundle +++ b/test/functional/update/skip-verified-fullfiles/web-dir/10/Manifest.test-bundle @@ -1,8 +1,8 @@ MANIFEST 3 version: 10 previous: 0 -filecount: 2 +filecount: 1 timestamp: 1451936779 contentsize: 17929151 -F... 520f83440d3dddc25ad09ca858b9c669245f82d3181a45cdfe793aac9dd1fb15 10 /foo +F... a0d1fedf40ed8ae04757956cd3013e054134f4fd4119b74067ee062eb5bbbf61 10 /foo diff --git a/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.MoM b/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.MoM index e26ddf12..a3738553 100644 --- a/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.MoM +++ b/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.MoM @@ -1,9 +1,9 @@ MANIFEST 3 version: 100 -previous: 0 +previous: 10 filecount: 2 timestamp: 1451940175 contentsize: 13805671819 M... 1d951049819a561cafa046f5350511d6a132f0e821c342ebe23908911888d01f 10 os-core -M... fb3b6bc74f3813f031deae78679dbde15a81b4b755a8dc247e6ad13da6968689 100 test-bundle +M... 4a53f6e18e9abc81eb1341e1ca496b6213d81fe85e9455366f8e970f84d34d0c 100 test-bundle diff --git a/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.test-bundle b/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.test-bundle index e40ee9aa..0dbdbeab 100644 --- a/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.test-bundle +++ b/test/functional/update/skip-verified-fullfiles/web-dir/100/Manifest.test-bundle @@ -1,8 +1,8 @@ MANIFEST 3 version: 100 -previous: 0 -filecount: 2 +previous: 10 +filecount: 1 timestamp: 1451936779 contentsize: 17929151 -F... 520f83440d3dddc25ad09ca858b9c669245f82d3181a45cdfe793aac9dd1fb15 100 /foo +F... a0d1fedf40ed8ae04757956cd3013e054134f4fd4119b74067ee062eb5bbbf61 100 /foo diff --git a/test/functional/update/use-full-file/test.bats b/test/functional/update/use-full-file/test.bats index aa7c98f7..630e2ae2 100755 --- a/test/functional/update/use-full-file/test.bats +++ b/test/functional/update/use-full-file/test.bats @@ -36,9 +36,9 @@ teardown() { ignore_sigverify_error 9 [ "${lines[9]}" = "Downloading os-core pack for version 100" ] [ "${lines[10]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[11]}" = " changed manifests : 1" ] - [ "${lines[12]}" = " new manifests : 0" ] - [ "${lines[13]}" = " deleted manifests : 0" ] + [ "${lines[11]}" = " changed bundles : 1" ] + [ "${lines[12]}" = " new bundles : 0" ] + [ "${lines[13]}" = " deleted bundles : 0" ] [ "${lines[14]}" = " changed files : 1" ] [ "${lines[15]}" = " new files : 0" ] [ "${lines[16]}" = " deleted files : 0" ] diff --git a/test/functional/update/use-pack/test.bats b/test/functional/update/use-pack/test.bats index 8871f9cf..ddbd56bc 100755 --- a/test/functional/update/use-pack/test.bats +++ b/test/functional/update/use-pack/test.bats @@ -38,9 +38,9 @@ teardown() { [ "${lines[9]}" = "Downloading os-core pack for version 100" ] [ "${lines[10]}" = "Extracting pack." ] [ "${lines[11]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[12]}" = " changed manifests : 1" ] - [ "${lines[13]}" = " new manifests : 0" ] - [ "${lines[14]}" = " deleted manifests : 0" ] + [ "${lines[12]}" = " changed bundles : 1" ] + [ "${lines[13]}" = " new bundles : 0" ] + [ "${lines[14]}" = " deleted bundles : 0" ] [ "${lines[15]}" = " changed files : 1" ] [ "${lines[16]}" = " new files : 0" ] [ "${lines[17]}" = " deleted files : 0" ] diff --git a/test/functional/update/verify-fix-path-hash-mismatch/test.bats b/test/functional/update/verify-fix-path-hash-mismatch/test.bats index 10aa466a..0a2e75bd 100755 --- a/test/functional/update/verify-fix-path-hash-mismatch/test.bats +++ b/test/functional/update/verify-fix-path-hash-mismatch/test.bats @@ -43,9 +43,9 @@ teardown() { ignore_sigverify_error 9 [ "${lines[9]}" = "Downloading test-bundle pack for version 100" ] [ "${lines[10]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[11]}" = " changed manifests : 1" ] - [ "${lines[12]}" = " new manifests : 0" ] - [ "${lines[13]}" = " deleted manifests : 0" ] + [ "${lines[11]}" = " changed bundles : 1" ] + [ "${lines[12]}" = " new bundles : 0" ] + [ "${lines[13]}" = " deleted bundles : 0" ] [ "${lines[14]}" = " changed files : 1" ] [ "${lines[15]}" = " new files : 0" ] [ "${lines[16]}" = " deleted files : 0" ] diff --git a/test/functional/update/verify-fix-path-missing-dir/test.bats b/test/functional/update/verify-fix-path-missing-dir/test.bats index afb9cd5e..d88e0a56 100755 --- a/test/functional/update/verify-fix-path-missing-dir/test.bats +++ b/test/functional/update/verify-fix-path-missing-dir/test.bats @@ -48,9 +48,9 @@ teardown() { ignore_sigverify_error 9 [ "${lines[9]}" = "Downloading test-bundle pack for version 100" ] [ "${lines[10]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[11]}" = " changed manifests : 1" ] - [ "${lines[12]}" = " new manifests : 0" ] - [ "${lines[13]}" = " deleted manifests : 0" ] + [ "${lines[11]}" = " changed bundles : 1" ] + [ "${lines[12]}" = " new bundles : 0" ] + [ "${lines[13]}" = " deleted bundles : 0" ] [ "${lines[14]}" = " changed files : 1" ] [ "${lines[15]}" = " new files : 0" ] [ "${lines[16]}" = " deleted files : 0" ] diff --git a/test/functional/update/verify-fullfile-hash/test.bats b/test/functional/update/verify-fullfile-hash/test.bats index 10bdb959..11ce476b 100755 --- a/test/functional/update/verify-fullfile-hash/test.bats +++ b/test/functional/update/verify-fullfile-hash/test.bats @@ -36,9 +36,9 @@ teardown() { ignore_sigverify_error 9 [ "${lines[9]}" = "Downloading test-bundle pack for version 100" ] [ "${lines[10]}" = "Statistics for going from version 10 to version 100:" ] - [ "${lines[11]}" = " changed manifests : 1" ] - [ "${lines[12]}" = " new manifests : 0" ] - [ "${lines[13]}" = " deleted manifests : 0" ] + [ "${lines[11]}" = " changed bundles : 1" ] + [ "${lines[12]}" = " new bundles : 0" ] + [ "${lines[13]}" = " deleted bundles : 0" ] [ "${lines[14]}" = " changed files : 1" ] [ "${lines[15]}" = " new files : 0" ] [ "${lines[16]}" = " deleted files : 0" ]