From acad8c47b082eaa244792de5a3b9745ff702ddeb Mon Sep 17 00:00:00 2001 From: William Douglas Date: Thu, 24 Apr 2025 11:12:46 -0700 Subject: [PATCH] Add format information to update output The current format is very useful information to get from bug reports so add it as default output to swupd update. Signed-off-by: William Douglas --- src/cmds/update.c | 2 +- .../3rd-party/3rd-party-update-basic.bats | 4 ++-- .../3rd-party-update-dangerous-flags.bats | 8 ++++---- ...-party-update-export-template-multi-repo.bats | 4 ++-- .../3rd-party-update-export-template.bats | 6 +++--- .../3rd-party/3rd-party-update-exported-bin.bats | 2 +- .../3rd-party-update-specific-version.bats | 2 +- test/functional/bundlelist/list-orphans.bats | 2 +- test/functional/bundleremove/remove-orphans.bats | 2 +- .../only_in_ci_slow/update-non-responsive.bats | 2 +- .../only_in_ci_slow/update-slow-server.bats | 2 +- .../expired-certificate-latest.bats | 2 +- .../expired-certificate-mom.bats | 2 +- .../only_in_ci_system/update-no-disk-space.bats | 8 ++++---- test/functional/signature/alt-key-rotation.bats | 4 ++-- test/functional/signature/key-rotation.bats | 8 ++++---- test/functional/signature/version-sig-check.bats | 6 +++--- test/functional/update/update-3rd-party.bats | 8 ++++---- test/functional/update/update-attr-change.bats | 2 +- test/functional/update/update-boot-file.bats | 2 +- test/functional/update/update-boot-manager.bats | 2 +- test/functional/update/update-boot-skip.bats | 2 +- .../functional/update/update-bundle-removed.bats | 2 +- .../update/update-deleted-include-manifest.bats | 2 +- test/functional/update/update-download.bats | 2 +- .../update/update-fail-to-get-mom.bats | 4 ++-- .../update/update-ignore-also-add.bats | 2 +- ...ate-include-old-bundle-with-tracked-file.bats | 2 +- .../update/update-include-old-bundle.bats | 2 +- test/functional/update/update-include.bats | 2 +- test/functional/update/update-incremental.bats | 16 ++++++++-------- test/functional/update/update-json.bats | 2 +- .../update/update-manifest-delta-recover.bats | 4 ++-- .../functional/update/update-manifest-delta.bats | 6 +++--- test/functional/update/update-minversion.bats | 2 +- .../update/update-missing-os-core.bats | 2 +- test/functional/update/update-newest-added.bats | 2 +- .../functional/update/update-newest-deleted.bats | 2 +- .../functional/update/update-newest-ghosted.bats | 2 +- .../update/update-re-update-bad-os-release.bats | 2 +- .../update/update-re-update-required.bats | 4 ++-- .../functional/update/update-rename-ghosted.bats | 2 +- test/functional/update/update-rename.bats | 2 +- .../update/update-search-file-index.bats | 4 ++-- test/functional/update/update-skip-scripts.bats | 2 +- .../update/update-skip-verified-fullfiles.bats | 2 +- .../update/update-statedir-bad-hash.bats | 2 +- .../update/update-type-changes-dir-to-file.bats | 2 +- ...e-type-changes-file-to-recursive-symlink.bats | 2 +- .../update-type-changes-file-to-symlink.bats | 2 +- .../update-type-changes-symlink-to-file.bats | 2 +- .../update/update-unusual-file-names.bats | 2 +- test/functional/update/update-use-full-file.bats | 2 +- test/functional/update/update-use-pack.bats | 2 +- .../update-verify-fix-path-hash-mismatch.bats | 2 +- .../update-verify-fix-path-missing-dir.bats | 2 +- .../update/update-verify-fullfile-hash.bats | 2 +- .../update/update-with-mirror-signature.bats | 4 ++-- test/functional/update/update-with-mirror.bats | 2 +- .../update/update-with-old-mirror.bats | 2 +- .../update/update-with-slightly-old-mirror.bats | 2 +- 61 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/cmds/update.c b/src/cmds/update.c index f1369d95..a1c196f6 100644 --- a/src/cmds/update.c +++ b/src/cmds/update.c @@ -337,7 +337,7 @@ enum swupd_code execute_update_extra(extra_proc_fn_t post_update_fn, extra_proc_ goto clean_curl; } - info("Preparing to update from %i to %i\n", current_version, server_version); + info("Preparing to update from %i to %i (in format %s)\n", current_version, server_version, globals.format_string); timelist_timer_stop(globals.global_times); // closing: Get versions /* housekeeping */ diff --git a/test/functional/3rd-party/3rd-party-update-basic.bats b/test/functional/3rd-party/3rd-party-update-basic.bats index 17e70844..7a31d021 100755 --- a/test/functional/3rd-party/3rd-party-update-basic.bats +++ b/test/functional/3rd-party/3rd-party-update-basic.bats @@ -33,7 +33,7 @@ test_setup() { expected_output=$(cat <<-EOM Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -87,7 +87,7 @@ test_setup() { __________________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats b/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats index 23ca73e1..bb47c55b 100755 --- a/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats +++ b/test/functional/3rd-party/3rd-party-update-dangerous-flags.bats @@ -51,7 +51,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -93,7 +93,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -133,7 +133,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -167,7 +167,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats b/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats index b05b8ef4..86b49bee 100755 --- a/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats +++ b/test/functional/3rd-party/3rd-party-update-export-template-multi-repo.bats @@ -56,7 +56,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 @@ -152,7 +152,7 @@ test_setup() { expected_output=$(cat <<-EOM Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/3rd-party/3rd-party-update-export-template.bats b/test/functional/3rd-party/3rd-party-update-export-template.bats index 3145d9f4..4d1390a0 100755 --- a/test/functional/3rd-party/3rd-party-update-export-template.bats +++ b/test/functional/3rd-party/3rd-party-update-export-template.bats @@ -44,7 +44,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 @@ -112,7 +112,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 @@ -186,7 +186,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/3rd-party/3rd-party-update-exported-bin.bats b/test/functional/3rd-party/3rd-party-update-exported-bin.bats index f15f46a3..cd75a980 100755 --- a/test/functional/3rd-party/3rd-party-update-exported-bin.bats +++ b/test/functional/3rd-party/3rd-party-update-exported-bin.bats @@ -50,7 +50,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle3 - os-core diff --git a/test/functional/3rd-party/3rd-party-update-specific-version.bats b/test/functional/3rd-party/3rd-party-update-specific-version.bats index 4e21c11f..030ec0de 100755 --- a/test/functional/3rd-party/3rd-party-update-specific-version.bats +++ b/test/functional/3rd-party/3rd-party-update-specific-version.bats @@ -28,7 +28,7 @@ test_setup() { expected_output=$(cat <<-EOM Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/bundlelist/list-orphans.bats b/test/functional/bundlelist/list-orphans.bats index 330d751c..621f85cb 100755 --- a/test/functional/bundlelist/list-orphans.bats +++ b/test/functional/bundlelist/list-orphans.bats @@ -75,7 +75,7 @@ teardown_file() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/bundleremove/remove-orphans.bats b/test/functional/bundleremove/remove-orphans.bats index 10b7165b..62320b19 100755 --- a/test/functional/bundleremove/remove-orphans.bats +++ b/test/functional/bundleremove/remove-orphans.bats @@ -67,7 +67,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/only_in_ci_slow/update-non-responsive.bats b/test/functional/only_in_ci_slow/update-non-responsive.bats index b611fd9d..123c2620 100755 --- a/test/functional/only_in_ci_slow/update-non-responsive.bats +++ b/test/functional/only_in_ci_slow/update-non-responsive.bats @@ -112,7 +112,7 @@ test_setup() { Checking mirror status Warning: Upstream server http://localhost:$port/ not responding, cannot determine upstream version Warning: Unable to determine if the mirror is up to date - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/only_in_ci_slow/update-slow-server.bats b/test/functional/only_in_ci_slow/update-slow-server.bats index e89bd191..d3a8c199 100755 --- a/test/functional/only_in_ci_slow/update-slow-server.bats +++ b/test/functional/only_in_ci_slow/update-slow-server.bats @@ -31,7 +31,7 @@ test_setup() { Warning: This is an insecure connection The --allow-insecure-http flag was used, be aware that this poses a threat to the system Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 \(in format staging\) Downloading packs for: - test-bundle Error: Curl - File incompletely downloaded - '.*/100/pack-test-bundle-from-10.tar' diff --git a/test/functional/only_in_ci_system/expired-certificate-latest.bats b/test/functional/only_in_ci_system/expired-certificate-latest.bats index 4f47326d..45c144c1 100755 --- a/test/functional/only_in_ci_system/expired-certificate-latest.bats +++ b/test/functional/only_in_ci_system/expired-certificate-latest.bats @@ -67,7 +67,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/only_in_ci_system/expired-certificate-mom.bats b/test/functional/only_in_ci_system/expired-certificate-mom.bats index 27e25967..46ebf4c7 100755 --- a/test/functional/only_in_ci_system/expired-certificate-mom.bats +++ b/test/functional/only_in_ci_system/expired-certificate-mom.bats @@ -68,7 +68,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Warning: Signature check failed Warning: Removing corrupt Manifest.MoM artifacts and re-downloading... Warning: Signature check failed diff --git a/test/functional/only_in_ci_system/update-no-disk-space.bats b/test/functional/only_in_ci_system/update-no-disk-space.bats index 8d7e4c9e..4000a907 100755 --- a/test/functional/only_in_ci_system/update-no-disk-space.bats +++ b/test/functional/only_in_ci_system/update-no-disk-space.bats @@ -73,7 +73,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Error: Curl - Error downloading to local file - 'file://$ABS_TEST_DIR/web-dir/20/Manifest.MoM.tar' Error: Curl - Check free space for $ABS_TEST_DIR/testfs/state? Error: Failed to retrieve 20 MoM manifest @@ -103,7 +103,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Error: Curl - Error downloading to local file - 'file://$ABS_TEST_DIR/web-dir/10/Manifest.test-bundle.tar' Error: Curl - Check free space for $ABS_TEST_DIR/testfs/state? Error: Failed to retrieve 10 test-bundle manifest @@ -134,7 +134,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Error: Curl - Error downloading to local file - 'file://$ABS_TEST_DIR/web-dir/20/Manifest.test-bundle.tar' Error: Curl - Check free space for $ABS_TEST_DIR/testfs/state? Error: Failed to retrieve 20 test-bundle manifest @@ -158,7 +158,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_DOWNLOAD_FILE" expected_output1=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Downloading packs \\(20.*\\) for: EOM ) diff --git a/test/functional/signature/alt-key-rotation.bats b/test/functional/signature/alt-key-rotation.bats index fd8406a0..f5f490bd 100755 --- a/test/functional/signature/alt-key-rotation.bats +++ b/test/functional/signature/alt-key-rotation.bats @@ -50,7 +50,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -78,7 +78,7 @@ test_setup() { expected_output=$(cat <<-EOM Update started Warning: Default cert failed, attempting to use alternative: .*alt - Preparing to update from 40 to 50 + Preparing to update from 40 to 50 \(in format 2\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/signature/key-rotation.bats b/test/functional/signature/key-rotation.bats index 72c59d7a..143bc07a 100755 --- a/test/functional/signature/key-rotation.bats +++ b/test/functional/signature/key-rotation.bats @@ -56,7 +56,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -83,7 +83,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 40 to 50 + Preparing to update from 40 to 50 (in format 2) Downloading packs for: - os-core Finishing packs extraction... @@ -117,7 +117,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -144,7 +144,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 40 to 50 + Preparing to update from 40 to 50 (in format 2) Warning: Signature check failed Warning: Removing corrupt Manifest.MoM artifacts and re-downloading... Warning: Signature check failed diff --git a/test/functional/signature/version-sig-check.bats b/test/functional/signature/version-sig-check.bats index 586ebfde..a5d492ec 100755 --- a/test/functional/signature/version-sig-check.bats +++ b/test/functional/signature/version-sig-check.bats @@ -75,7 +75,7 @@ test_setup() { Update started Warning: The --nosigcheck flag was used and this compromises the system security Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/version/formatstaging/latest WILL NOT BE VERIFIED - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/10/Manifest.MoM WILL NOT BE VERIFIED Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/20/Manifest.MoM WILL NOT BE VERIFIED Downloading packs for: @@ -113,7 +113,7 @@ test_setup() { Update started Warning: The --nosigcheck-latest flag was used and this compromises the system security Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/version/formatstaging/latest WILL NOT BE VERIFIED - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -150,7 +150,7 @@ test_setup() { Update started Warning: The --nosigcheck-latest flag was used and this compromises the system security Warning: THE SIGNATURE OF file://$ABS_TEST_DIR/web-dir/version/formatstaging/latest WILL NOT BE VERIFIED - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Warning: Signature check failed Warning: Removing corrupt Manifest.MoM artifacts and re-downloading... Warning: Signature check failed diff --git a/test/functional/update/update-3rd-party.bats b/test/functional/update/update-3rd-party.bats index a56ef963..d56ba698 100755 --- a/test/functional/update/update-3rd-party.bats +++ b/test/functional/update/update-3rd-party.bats @@ -31,7 +31,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - upstream-bundle Finishing packs extraction... @@ -54,7 +54,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -149,7 +149,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - upstream-bundle Finishing packs extraction... @@ -173,7 +173,7 @@ test_setup() { _____________________________ Updates from a 3rd-party repository are forced to run with the --no-scripts flag for security reasons Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-attr-change.bats b/test/functional/update/update-attr-change.bats index b69ef626..cc5ffd20 100755 --- a/test/functional/update/update-attr-change.bats +++ b/test/functional/update/update-attr-change.bats @@ -71,7 +71,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-boot-file.bats b/test/functional/update/update-boot-file.bats index 184ea3ad..2e87c4ea 100755 --- a/test/functional/update/update-boot-file.bats +++ b/test/functional/update/update-boot-file.bats @@ -16,7 +16,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-boot-manager.bats b/test/functional/update/update-boot-manager.bats index c60353ab..a05b48e7 100755 --- a/test/functional/update/update-boot-manager.bats +++ b/test/functional/update/update-boot-manager.bats @@ -35,7 +35,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/update/update-boot-skip.bats b/test/functional/update/update-boot-skip.bats index e591334c..7e68a56a 100755 --- a/test/functional/update/update-boot-skip.bats +++ b/test/functional/update/update-boot-skip.bats @@ -17,7 +17,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-bundle-removed.bats b/test/functional/update/update-bundle-removed.bats index 168234ab..0f7bf9a2 100755 --- a/test/functional/update/update-bundle-removed.bats +++ b/test/functional/update/update-bundle-removed.bats @@ -24,7 +24,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-deleted-include-manifest.bats b/test/functional/update/update-deleted-include-manifest.bats index 7281dece..3f8598d0 100755 --- a/test/functional/update/update-deleted-include-manifest.bats +++ b/test/functional/update/update-deleted-include-manifest.bats @@ -28,7 +28,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Error: Failed to retrieve 10 test-bundle2 manifest Error: Unable to download manifest test-bundle2 version 10, exiting now Update failed diff --git a/test/functional/update/update-download.bats b/test/functional/update/update-download.bats index b334df9b..81f3c962 100755 --- a/test/functional/update/update-download.bats +++ b/test/functional/update/update-download.bats @@ -17,7 +17,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-fail-to-get-mom.bats b/test/functional/update/update-fail-to-get-mom.bats index a4a548fe..6d42393e 100755 --- a/test/functional/update/update-fail-to-get-mom.bats +++ b/test/functional/update/update-fail-to-get-mom.bats @@ -19,7 +19,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Error: Failed to retrieve 10 MoM manifest Update failed EOM @@ -38,7 +38,7 @@ test_setup() { assert_status_is "$SWUPD_COULDNT_LOAD_MOM" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 \(in format staging\) Error: Failed to retrieve 20 MoM manifest Update failed EOM diff --git a/test/functional/update/update-ignore-also-add.bats b/test/functional/update/update-ignore-also-add.bats index 8eeaa05d..5cdd6ecd 100755 --- a/test/functional/update/update-ignore-also-add.bats +++ b/test/functional/update/update-ignore-also-add.bats @@ -29,7 +29,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-include-old-bundle-with-tracked-file.bats b/test/functional/update/update-include-old-bundle-with-tracked-file.bats index c183a607..edb4d9c5 100755 --- a/test/functional/update/update-include-old-bundle-with-tracked-file.bats +++ b/test/functional/update/update-include-old-bundle-with-tracked-file.bats @@ -24,7 +24,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format staging) Downloading packs for: - test-bundle1 - os-core diff --git a/test/functional/update/update-include-old-bundle.bats b/test/functional/update/update-include-old-bundle.bats index e5b77230..137ae2cb 100755 --- a/test/functional/update/update-include-old-bundle.bats +++ b/test/functional/update/update-include-old-bundle.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle2 - test-bundle1 diff --git a/test/functional/update/update-include.bats b/test/functional/update/update-include.bats index a85c6160..1bb58269 100755 --- a/test/functional/update/update-include.bats +++ b/test/functional/update/update-include.bats @@ -40,7 +40,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle6 - test-bundle5 diff --git a/test/functional/update/update-incremental.bats b/test/functional/update/update-incremental.bats index 938212b5..27ea618a 100755 --- a/test/functional/update/update-incremental.bats +++ b/test/functional/update/update-incremental.bats @@ -29,7 +29,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -65,7 +65,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -83,7 +83,7 @@ test_teardown() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -120,7 +120,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -138,7 +138,7 @@ test_teardown() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -177,7 +177,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -195,7 +195,7 @@ test_teardown() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 20 to 30 + Preparing to update from 20 to 30 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -238,7 +238,7 @@ test_teardown() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 50 + Preparing to update from 10 to 50 (in format 1) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-json.bats b/test/functional/update/update-json.bats index 1ac32894..23a458e9 100755 --- a/test/functional/update/update-json.bats +++ b/test/functional/update/update-json.bats @@ -30,7 +30,7 @@ test_setup() { { "type" : "start", "section" : "update" }, { "type" : "progress", "currentStep" : 1, "totalSteps" : 10, "stepCompletion" : -1, "stepDescription" : "load_manifests" }, { "type" : "info", "msg" : "Update started" }, - { "type" : "info", "msg" : "Preparing to update from 10 to 20" }, + { "type" : "info", "msg" : "Preparing to update from 10 to 20 (in format staging)" }, { "type" : "progress", "currentStep" : 1, "totalSteps" : 10, "stepCompletion" : 100, "stepDescription" : "load_manifests" }, { "type" : "progress", "currentStep" : 2, "totalSteps" : 10, "stepCompletion" : -1, "stepDescription" : "run_preupdate_scripts" }, { "type" : "progress", "currentStep" : 2, "totalSteps" : 10, "stepCompletion" : 100, "stepDescription" : "run_preupdate_scripts" }, diff --git a/test/functional/update/update-manifest-delta-recover.bats b/test/functional/update/update-manifest-delta-recover.bats index f0481a08..c93fabd4 100755 --- a/test/functional/update/update-manifest-delta-recover.bats +++ b/test/functional/update/update-manifest-delta-recover.bats @@ -29,7 +29,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -61,7 +61,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Warning: hash check failed for Manifest.test-bundle1 for version 30. Deleting it Warning: Removing corrupt Manifest.test-bundle1 artifacts and re-downloading... Downloading packs for: diff --git a/test/functional/update/update-manifest-delta.bats b/test/functional/update/update-manifest-delta.bats index 77e24fbc..84042331 100755 --- a/test/functional/update/update-manifest-delta.bats +++ b/test/functional/update/update-manifest-delta.bats @@ -35,7 +35,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -68,7 +68,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Downloading packs for: - test-bundle1 - test-bundle2 @@ -104,7 +104,7 @@ test_setup() { assert_status_is "$SWUPD_RECURSE_MANIFEST" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Error: Failed to retrieve 30 test-bundle2 manifest Error: Unable to download manifest test-bundle2 version 30, exiting now Update failed diff --git a/test/functional/update/update-minversion.bats b/test/functional/update/update-minversion.bats index e75c0aeb..a362b5a8 100755 --- a/test/functional/update/update-minversion.bats +++ b/test/functional/update/update-minversion.bats @@ -20,7 +20,7 @@ test_setup() { expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - bundle1 - os-core diff --git a/test/functional/update/update-missing-os-core.bats b/test/functional/update/update-missing-os-core.bats index 5fd3826b..6713325c 100755 --- a/test/functional/update/update-missing-os-core.bats +++ b/test/functional/update/update-missing-os-core.bats @@ -20,7 +20,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core - test-bundle diff --git a/test/functional/update/update-newest-added.bats b/test/functional/update/update-newest-added.bats index ef836bea..2de277c0 100755 --- a/test/functional/update/update-newest-added.bats +++ b/test/functional/update/update-newest-added.bats @@ -21,7 +21,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-newest-deleted.bats b/test/functional/update/update-newest-deleted.bats index 1b894383..68f4c84a 100755 --- a/test/functional/update/update-newest-deleted.bats +++ b/test/functional/update/update-newest-deleted.bats @@ -30,7 +30,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 30 + Preparing to update from 10 to 30 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/update/update-newest-ghosted.bats b/test/functional/update/update-newest-ghosted.bats index cb1bb129..f925c90e 100755 --- a/test/functional/update/update-newest-ghosted.bats +++ b/test/functional/update/update-newest-ghosted.bats @@ -18,7 +18,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-re-update-bad-os-release.bats b/test/functional/update/update-re-update-bad-os-release.bats index 6835cb61..0755c98b 100755 --- a/test/functional/update/update-re-update-bad-os-release.bats +++ b/test/functional/update/update-re-update-bad-os-release.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is "$SWUPD_CURRENT_VERSION_UNKNOWN" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-re-update-required.bats b/test/functional/update/update-re-update-required.bats index 706b0d88..b996911e 100755 --- a/test/functional/update/update-re-update-required.bats +++ b/test/functional/update/update-re-update-required.bats @@ -17,7 +17,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format 1) Downloading packs for: - os-core Finishing packs extraction... @@ -35,7 +35,7 @@ test_setup() { Calling post-update helper scripts Update successful - System updated from version 10 to version 20 Update started - Preparing to update from 30 to 40 + Preparing to update from 30 to 40 (in format 2) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-rename-ghosted.bats b/test/functional/update/update-rename-ghosted.bats index f534eaff..3afbfed7 100755 --- a/test/functional/update/update-rename-ghosted.bats +++ b/test/functional/update/update-rename-ghosted.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-rename.bats b/test/functional/update/update-rename.bats index b10cd16f..60af6459 100755 --- a/test/functional/update/update-rename.bats +++ b/test/functional/update/update-rename.bats @@ -21,7 +21,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-search-file-index.bats b/test/functional/update/update-search-file-index.bats index 0ef75612..2d70ab7e 100755 --- a/test/functional/update/update-search-file-index.bats +++ b/test/functional/update/update-search-file-index.bats @@ -18,7 +18,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... @@ -49,7 +49,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 \(in format staging\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-skip-scripts.bats b/test/functional/update/update-skip-scripts.bats index 4d36fa95..764cecf1 100755 --- a/test/functional/update/update-skip-scripts.bats +++ b/test/functional/update/update-skip-scripts.bats @@ -19,7 +19,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-skip-verified-fullfiles.bats b/test/functional/update/update-skip-verified-fullfiles.bats index 5a46713f..65c08cf8 100755 --- a/test/functional/update/update-skip-verified-fullfiles.bats +++ b/test/functional/update/update-skip-verified-fullfiles.bats @@ -27,7 +27,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-statedir-bad-hash.bats b/test/functional/update/update-statedir-bad-hash.bats index c7f12659..7b497434 100755 --- a/test/functional/update/update-statedir-bad-hash.bats +++ b/test/functional/update/update-statedir-bad-hash.bats @@ -21,7 +21,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-type-changes-dir-to-file.bats b/test/functional/update/update-type-changes-dir-to-file.bats index 25d7c0fb..bbebf060 100755 --- a/test/functional/update/update-type-changes-dir-to-file.bats +++ b/test/functional/update/update-type-changes-dir-to-file.bats @@ -52,7 +52,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-type-changes-file-to-recursive-symlink.bats b/test/functional/update/update-type-changes-file-to-recursive-symlink.bats index bd7fe2dc..7e8ce1e7 100755 --- a/test/functional/update/update-type-changes-file-to-recursive-symlink.bats +++ b/test/functional/update/update-type-changes-file-to-recursive-symlink.bats @@ -60,7 +60,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - os-core - test-bundle1 diff --git a/test/functional/update/update-type-changes-file-to-symlink.bats b/test/functional/update/update-type-changes-file-to-symlink.bats index 97e97808..53054246 100755 --- a/test/functional/update/update-type-changes-file-to-symlink.bats +++ b/test/functional/update/update-type-changes-file-to-symlink.bats @@ -53,7 +53,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-type-changes-symlink-to-file.bats b/test/functional/update/update-type-changes-symlink-to-file.bats index 232d496e..d5b5041f 100755 --- a/test/functional/update/update-type-changes-symlink-to-file.bats +++ b/test/functional/update/update-type-changes-symlink-to-file.bats @@ -65,7 +65,7 @@ test_setup() { assert_status_is "$SWUPD_OK" expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-unusual-file-names.bats b/test/functional/update/update-unusual-file-names.bats index 8c13eee2..24e7cc5f 100755 --- a/test/functional/update/update-unusual-file-names.bats +++ b/test/functional/update/update-unusual-file-names.bats @@ -39,7 +39,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 - os-core diff --git a/test/functional/update/update-use-full-file.bats b/test/functional/update/update-use-full-file.bats index 7fc67874..360f5f0f 100755 --- a/test/functional/update/update-use-full-file.bats +++ b/test/functional/update/update-use-full-file.bats @@ -20,7 +20,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-use-pack.bats b/test/functional/update/update-use-pack.bats index f8f3c44f..169c6df0 100755 --- a/test/functional/update/update-use-pack.bats +++ b/test/functional/update/update-use-pack.bats @@ -16,7 +16,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-verify-fix-path-hash-mismatch.bats b/test/functional/update/update-verify-fix-path-hash-mismatch.bats index 001a2386..62fc337c 100755 --- a/test/functional/update/update-verify-fix-path-hash-mismatch.bats +++ b/test/functional/update/update-verify-fix-path-hash-mismatch.bats @@ -29,7 +29,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-verify-fix-path-missing-dir.bats b/test/functional/update/update-verify-fix-path-missing-dir.bats index f95c982f..ffd7ab99 100755 --- a/test/functional/update/update-verify-fix-path-missing-dir.bats +++ b/test/functional/update/update-verify-fix-path-missing-dir.bats @@ -22,7 +22,7 @@ test_setup() { assert_status_is 0 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 (in format staging) Downloading packs for: - test-bundle Finishing packs extraction... diff --git a/test/functional/update/update-verify-fullfile-hash.bats b/test/functional/update/update-verify-fullfile-hash.bats index 79f75639..1d90281f 100755 --- a/test/functional/update/update-verify-fullfile-hash.bats +++ b/test/functional/update/update-verify-fullfile-hash.bats @@ -26,7 +26,7 @@ test_setup() { assert_status_is 1 expected_output=$(cat <<-EOM Update started - Preparing to update from 10 to 100 + Preparing to update from 10 to 100 \(in format staging\) Downloading packs for: - os-core Finishing packs extraction... diff --git a/test/functional/update/update-with-mirror-signature.bats b/test/functional/update/update-with-mirror-signature.bats index 6d5a5294..a98bc615 100755 --- a/test/functional/update/update-with-mirror-signature.bats +++ b/test/functional/update/update-with-mirror-signature.bats @@ -31,7 +31,7 @@ test_setup() { Error: Signature for latest file (file://$ABS_MIRROR_DIR/version/formatstaging/latest) is missing Warning: the mirror version could not be determined Removing mirror configuration - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... @@ -68,7 +68,7 @@ test_setup() { Error: Signature verification failed for URL: file://$ABS_MIRROR_DIR/version/formatstaging/latest Warning: the mirror version could not be determined Removing mirror configuration - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-with-mirror.bats b/test/functional/update/update-with-mirror.bats index 3e6e11bf..85163477 100755 --- a/test/functional/update/update-with-mirror.bats +++ b/test/functional/update/update-with-mirror.bats @@ -34,7 +34,7 @@ test_setup() { expected_output=$(cat <<-EOM Update started Checking mirror status - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-with-old-mirror.bats b/test/functional/update/update-with-old-mirror.bats index d314b0d1..4d2117cd 100755 --- a/test/functional/update/update-with-old-mirror.bats +++ b/test/functional/update/update-with-old-mirror.bats @@ -37,7 +37,7 @@ test_setup() { Checking mirror status Warning: the mirror version (20) is too far behind upstream version (1000) Removing mirror configuration - Preparing to update from 10 to 1000 + Preparing to update from 10 to 1000 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction... diff --git a/test/functional/update/update-with-slightly-old-mirror.bats b/test/functional/update/update-with-slightly-old-mirror.bats index 7bdf3b18..88b077be 100755 --- a/test/functional/update/update-with-slightly-old-mirror.bats +++ b/test/functional/update/update-with-slightly-old-mirror.bats @@ -37,7 +37,7 @@ test_setup() { Update started Checking mirror status Warning: mirror version (20) is behind upstream version (100) - Preparing to update from 10 to 20 + Preparing to update from 10 to 20 (in format staging) Downloading packs for: - test-bundle1 Finishing packs extraction...