From e68a8a6db68366a8b0eefae0ea53f5870add3a51 Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Fri, 27 Apr 2018 15:02:26 -0700 Subject: [PATCH] Update tests to remove version download string Signed-off-by: Matthew Johnson --- test/functional/bundleadd/statedir/lines-checked | 1 - test/functional/bundlelist/all/list/lines-checked | 1 - test/functional/checkupdate/new-version/lines-checked | 1 - test/functional/checkupdate/no-server-content/lines-checked | 1 - test/functional/checkupdate/no-target-content/lines-checked | 1 - test/functional/checkupdate/slow-server/lines-checked | 1 - test/functional/checkupdate/version-match/lines-checked | 1 - test/functional/search/content-check-negfull-path/lines-checked | 1 - test/functional/search/content-check-neglibtest/lines-checked | 1 - test/functional/search/content-check-posbin/lines-checked | 1 - test/functional/search/content-check-posebin/lines-checked | 1 - test/functional/search/content-check-posfull-path/lines-checked | 1 - test/functional/search/content-check-poslib32/lines-checked | 1 - test/functional/search/content-check-poslib64/lines-checked | 1 - test/functional/update/apply-full-file-delta/lines-checked | 1 - test/functional/update/boot-file/lines-checked | 1 - test/functional/update/boot-skip/lines-checked | 1 - test/functional/update/delta-without-rename-flag/lines-checked | 1 - test/functional/update/download/lines-checked | 1 - .../update/include-old-bundle-with-tracked-file/lines-checked | 1 - test/functional/update/include-old-bundle/lines-checked | 1 - test/functional/update/include/lines-checked | 1 - test/functional/update/missing-os-core/lines-checked | 1 - test/functional/update/newest-deleted/lines-checked | 1 - test/functional/update/newest-ghosted/lines-checked | 1 - test/functional/update/re-update-bad-os-release/lines-checked | 1 - test/functional/update/re-update-required/lines-checked | 2 -- test/functional/update/rename-ghosted/lines-checked | 1 - test/functional/update/rename/lines-checked | 1 - test/functional/update/skip-scripts/lines-checked | 1 - test/functional/update/skip-verified-fullfiles/lines-checked | 1 - test/functional/update/statedir-bad-hash/lines-checked | 1 - test/functional/update/status-no-server-content/lines-checked | 1 - test/functional/update/status-no-target-content/lines-checked | 1 - .../functional/update/status-version-double-quote/lines-checked | 1 - .../functional/update/status-version-single-quote/lines-checked | 1 - test/functional/update/status/lines-checked | 1 - test/functional/update/use-full-file/lines-checked | 1 - test/functional/update/use-pack/lines-checked | 1 - .../update/verify-fix-path-hash-mismatch/lines-checked | 1 - .../functional/update/verify-fix-path-missing-dir/lines-checked | 1 - test/functional/update/verify-fullfile-hash/lines-checked | 1 - test/functional/verify/format-mismatch/lines-checked | 1 - test/functional/verify/install-latest-directory/lines-checked | 1 - test/functional/verify/latest-missing/lines-checked | 1 - 45 files changed, 46 deletions(-) diff --git a/test/functional/bundleadd/statedir/lines-checked b/test/functional/bundleadd/statedir/lines-checked index d6f17de5..74498d15 100644 --- a/test/functional/bundleadd/statedir/lines-checked +++ b/test/functional/bundleadd/statedir/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory nothing to add, exiting now diff --git a/test/functional/bundlelist/all/list/lines-checked b/test/functional/bundlelist/all/list/lines-checked index 4cc205a9..34e0b5e6 100644 --- a/test/functional/bundlelist/all/list/lines-checked +++ b/test/functional/bundlelist/all/list/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory os-core diff --git a/test/functional/checkupdate/new-version/lines-checked b/test/functional/checkupdate/new-version/lines-checked index ff99aace..db4bca49 100644 --- a/test/functional/checkupdate/new-version/lines-checked +++ b/test/functional/checkupdate/new-version/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Current OS version: 10 There is a new OS version available: 100 diff --git a/test/functional/checkupdate/no-server-content/lines-checked b/test/functional/checkupdate/no-server-content/lines-checked index a4a86992..24ff2da7 100644 --- a/test/functional/checkupdate/no-server-content/lines-checked +++ b/test/functional/checkupdate/no-server-content/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Error: server does not report any version diff --git a/test/functional/checkupdate/no-target-content/lines-checked b/test/functional/checkupdate/no-target-content/lines-checked index d649e793..3b94f55b 100644 --- a/test/functional/checkupdate/no-target-content/lines-checked +++ b/test/functional/checkupdate/no-target-content/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Unable to determine current OS version diff --git a/test/functional/checkupdate/slow-server/lines-checked b/test/functional/checkupdate/slow-server/lines-checked index f34f6d41..11d3806c 100644 --- a/test/functional/checkupdate/slow-server/lines-checked +++ b/test/functional/checkupdate/slow-server/lines-checked @@ -1,4 +1,3 @@ Range command not supported by server, download resume disabled. -Attempting to download version string to memory Current OS version: 10 There is a new OS version available: 99990 diff --git a/test/functional/checkupdate/version-match/lines-checked b/test/functional/checkupdate/version-match/lines-checked index d3d74a09..2cf72fcd 100644 --- a/test/functional/checkupdate/version-match/lines-checked +++ b/test/functional/checkupdate/version-match/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Current OS version: 10 There are no updates available diff --git a/test/functional/search/content-check-negfull-path/lines-checked b/test/functional/search/content-check-negfull-path/lines-checked index 7af746ff..efba31b7 100644 --- a/test/functional/search/content-check-negfull-path/lines-checked +++ b/test/functional/search/content-check-negfull-path/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Searching for '/usr/lib64/test-lib100' diff --git a/test/functional/search/content-check-neglibtest/lines-checked b/test/functional/search/content-check-neglibtest/lines-checked index 1592de14..625fd02c 100644 --- a/test/functional/search/content-check-neglibtest/lines-checked +++ b/test/functional/search/content-check-neglibtest/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Searching for 'libtest-nohit' diff --git a/test/functional/search/content-check-posbin/lines-checked b/test/functional/search/content-check-posbin/lines-checked index 90998299..d644b7b7 100644 --- a/test/functional/search/content-check-posbin/lines-checked +++ b/test/functional/search/content-check-posbin/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Searching for 'test-bin' diff --git a/test/functional/search/content-check-posebin/lines-checked b/test/functional/search/content-check-posebin/lines-checked index 90998299..d644b7b7 100644 --- a/test/functional/search/content-check-posebin/lines-checked +++ b/test/functional/search/content-check-posebin/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Searching for 'test-bin' diff --git a/test/functional/search/content-check-posfull-path/lines-checked b/test/functional/search/content-check-posfull-path/lines-checked index f26e2245..60115018 100644 --- a/test/functional/search/content-check-posfull-path/lines-checked +++ b/test/functional/search/content-check-posfull-path/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Searching for '/usr/lib64/test-lib64' diff --git a/test/functional/search/content-check-poslib32/lines-checked b/test/functional/search/content-check-poslib32/lines-checked index 0273e9db..c0462034 100644 --- a/test/functional/search/content-check-poslib32/lines-checked +++ b/test/functional/search/content-check-poslib32/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Searching for 'test-lib32' diff --git a/test/functional/search/content-check-poslib64/lines-checked b/test/functional/search/content-check-poslib64/lines-checked index 9ec003c4..af720ac4 100644 --- a/test/functional/search/content-check-poslib64/lines-checked +++ b/test/functional/search/content-check-poslib64/lines-checked @@ -1,2 +1 @@ -Attempting to download version string to memory Searching for 'test-lib64' diff --git a/test/functional/update/apply-full-file-delta/lines-checked b/test/functional/update/apply-full-file-delta/lines-checked index 57e550ac..46230ee0 100644 --- a/test/functional/update/apply-full-file-delta/lines-checked +++ b/test/functional/update/apply-full-file-delta/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Extracting os-core pack for version 100 Statistics for going from version 10 to version 100: diff --git a/test/functional/update/boot-file/lines-checked b/test/functional/update/boot-file/lines-checked index c707b2d6..d172540a 100644 --- a/test/functional/update/boot-file/lines-checked +++ b/test/functional/update/boot-file/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/boot-skip/lines-checked b/test/functional/update/boot-skip/lines-checked index e8d9ab61..4c99b3b3 100644 --- a/test/functional/update/boot-skip/lines-checked +++ b/test/functional/update/boot-skip/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/delta-without-rename-flag/lines-checked b/test/functional/update/delta-without-rename-flag/lines-checked index 49017f0d..daf7c961 100644 --- a/test/functional/update/delta-without-rename-flag/lines-checked +++ b/test/functional/update/delta-without-rename-flag/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 20 Extracting os-core pack for version 20 Statistics for going from version 10 to version 20: diff --git a/test/functional/update/download/lines-checked b/test/functional/update/download/lines-checked index 53abbea8..35db2409 100644 --- a/test/functional/update/download/lines-checked +++ b/test/functional/update/download/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Extracting os-core pack for version 100 Statistics for going from version 10 to version 100: diff --git a/test/functional/update/include-old-bundle-with-tracked-file/lines-checked b/test/functional/update/include-old-bundle-with-tracked-file/lines-checked index d0a7b30d..e7d9219e 100644 --- a/test/functional/update/include-old-bundle-with-tracked-file/lines-checked +++ b/test/functional/update/include-old-bundle-with-tracked-file/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 20 to 30 Statistics for going from version 20 to version 30: changed bundles : 3 diff --git a/test/functional/update/include-old-bundle/lines-checked b/test/functional/update/include-old-bundle/lines-checked index 175a9bfb..44f5d3a4 100644 --- a/test/functional/update/include-old-bundle/lines-checked +++ b/test/functional/update/include-old-bundle/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 2 diff --git a/test/functional/update/include/lines-checked b/test/functional/update/include/lines-checked index 22bff50e..b5c82ffb 100644 --- a/test/functional/update/include/lines-checked +++ b/test/functional/update/include/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 2 diff --git a/test/functional/update/missing-os-core/lines-checked b/test/functional/update/missing-os-core/lines-checked index 268582c9..7841b796 100644 --- a/test/functional/update/missing-os-core/lines-checked +++ b/test/functional/update/missing-os-core/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 2 diff --git a/test/functional/update/newest-deleted/lines-checked b/test/functional/update/newest-deleted/lines-checked index 6897fe4f..4388a582 100644 --- a/test/functional/update/newest-deleted/lines-checked +++ b/test/functional/update/newest-deleted/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 20 to 30 Extracting os-core pack for version 30 Statistics for going from version 20 to version 30: diff --git a/test/functional/update/newest-ghosted/lines-checked b/test/functional/update/newest-ghosted/lines-checked index 6897fe4f..4388a582 100644 --- a/test/functional/update/newest-ghosted/lines-checked +++ b/test/functional/update/newest-ghosted/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 20 to 30 Extracting os-core pack for version 30 Statistics for going from version 20 to version 30: diff --git a/test/functional/update/re-update-bad-os-release/lines-checked b/test/functional/update/re-update-bad-os-release/lines-checked index 56cb206c..0543cec4 100644 --- a/test/functional/update/re-update-bad-os-release/lines-checked +++ b/test/functional/update/re-update-bad-os-release/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 20 Statistics for going from version 10 to version 20: changed bundles : 1 diff --git a/test/functional/update/re-update-required/lines-checked b/test/functional/update/re-update-required/lines-checked index ab2d04d5..1525a0ce 100644 --- a/test/functional/update/re-update-required/lines-checked +++ b/test/functional/update/re-update-required/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 20 Statistics for going from version 10 to version 20: changed bundles : 1 @@ -17,7 +16,6 @@ Update was applied. Update successful. System updated from version 10 to version 20 3 files were not in a pack Update started. -Attempting to download version string to memory Preparing to update from 100 to 110 Statistics for going from version 100 to version 110: changed bundles : 1 diff --git a/test/functional/update/rename-ghosted/lines-checked b/test/functional/update/rename-ghosted/lines-checked index 49017f0d..daf7c961 100644 --- a/test/functional/update/rename-ghosted/lines-checked +++ b/test/functional/update/rename-ghosted/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 20 Extracting os-core pack for version 20 Statistics for going from version 10 to version 20: diff --git a/test/functional/update/rename/lines-checked b/test/functional/update/rename/lines-checked index 49017f0d..daf7c961 100644 --- a/test/functional/update/rename/lines-checked +++ b/test/functional/update/rename/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 20 Extracting os-core pack for version 20 Statistics for going from version 10 to version 20: diff --git a/test/functional/update/skip-scripts/lines-checked b/test/functional/update/skip-scripts/lines-checked index a85c6108..78105877 100644 --- a/test/functional/update/skip-scripts/lines-checked +++ b/test/functional/update/skip-scripts/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/skip-verified-fullfiles/lines-checked b/test/functional/update/skip-verified-fullfiles/lines-checked index 0ecc574f..68148373 100644 --- a/test/functional/update/skip-verified-fullfiles/lines-checked +++ b/test/functional/update/skip-verified-fullfiles/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/statedir-bad-hash/lines-checked b/test/functional/update/statedir-bad-hash/lines-checked index a9c91646..62d8992f 100644 --- a/test/functional/update/statedir-bad-hash/lines-checked +++ b/test/functional/update/statedir-bad-hash/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/status-no-server-content/lines-checked b/test/functional/update/status-no-server-content/lines-checked index 4f8bce76..d964c250 100644 --- a/test/functional/update/status-no-server-content/lines-checked +++ b/test/functional/update/status-no-server-content/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Current OS version: 10 Cannot get the latest server version. Could not reach server diff --git a/test/functional/update/status-no-target-content/lines-checked b/test/functional/update/status-no-target-content/lines-checked index 4b299efa..d17fa75d 100644 --- a/test/functional/update/status-no-target-content/lines-checked +++ b/test/functional/update/status-no-target-content/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Cannot determine current OS version Latest server version: 100 diff --git a/test/functional/update/status-version-double-quote/lines-checked b/test/functional/update/status-version-double-quote/lines-checked index f4017620..921de0ce 100644 --- a/test/functional/update/status-version-double-quote/lines-checked +++ b/test/functional/update/status-version-double-quote/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Current OS version: 10 Latest server version: 100 diff --git a/test/functional/update/status-version-single-quote/lines-checked b/test/functional/update/status-version-single-quote/lines-checked index f4017620..921de0ce 100644 --- a/test/functional/update/status-version-single-quote/lines-checked +++ b/test/functional/update/status-version-single-quote/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Current OS version: 10 Latest server version: 100 diff --git a/test/functional/update/status/lines-checked b/test/functional/update/status/lines-checked index f4017620..921de0ce 100644 --- a/test/functional/update/status/lines-checked +++ b/test/functional/update/status/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Current OS version: 10 Latest server version: 100 diff --git a/test/functional/update/use-full-file/lines-checked b/test/functional/update/use-full-file/lines-checked index d9628952..8376de82 100644 --- a/test/functional/update/use-full-file/lines-checked +++ b/test/functional/update/use-full-file/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/use-pack/lines-checked b/test/functional/update/use-pack/lines-checked index 57e550ac..46230ee0 100644 --- a/test/functional/update/use-pack/lines-checked +++ b/test/functional/update/use-pack/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Extracting os-core pack for version 100 Statistics for going from version 10 to version 100: diff --git a/test/functional/update/verify-fix-path-hash-mismatch/lines-checked b/test/functional/update/verify-fix-path-hash-mismatch/lines-checked index df4e304c..a516a6b7 100644 --- a/test/functional/update/verify-fix-path-hash-mismatch/lines-checked +++ b/test/functional/update/verify-fix-path-hash-mismatch/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/verify-fix-path-missing-dir/lines-checked b/test/functional/update/verify-fix-path-missing-dir/lines-checked index fe182c17..5b8e6f4a 100644 --- a/test/functional/update/verify-fix-path-missing-dir/lines-checked +++ b/test/functional/update/verify-fix-path-missing-dir/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/update/verify-fullfile-hash/lines-checked b/test/functional/update/verify-fullfile-hash/lines-checked index 56871e27..1ad4daca 100644 --- a/test/functional/update/verify-fullfile-hash/lines-checked +++ b/test/functional/update/verify-fullfile-hash/lines-checked @@ -1,5 +1,4 @@ Update started. -Attempting to download version string to memory Preparing to update from 10 to 100 Statistics for going from version 10 to version 100: changed bundles : 1 diff --git a/test/functional/verify/format-mismatch/lines-checked b/test/functional/verify/format-mismatch/lines-checked index 5eff4771..e654d94d 100644 --- a/test/functional/verify/format-mismatch/lines-checked +++ b/test/functional/verify/format-mismatch/lines-checked @@ -1,5 +1,4 @@ Verifying version 20 ERROR: Mismatching formats detected when verifying 20 (expected: 1; actual: 2) -Attempting to download version string to memory Latest supported version to verify: 10 Error: Fix did not fully succeed diff --git a/test/functional/verify/install-latest-directory/lines-checked b/test/functional/verify/install-latest-directory/lines-checked index 4ff69af5..dceebd4a 100644 --- a/test/functional/verify/install-latest-directory/lines-checked +++ b/test/functional/verify/install-latest-directory/lines-checked @@ -1,4 +1,3 @@ -Attempting to download version string to memory Verifying version 100 Extracting os-core pack for version 100 Adding any missing files diff --git a/test/functional/verify/latest-missing/lines-checked b/test/functional/verify/latest-missing/lines-checked index f5d02960..d9abec11 100644 --- a/test/functional/verify/latest-missing/lines-checked +++ b/test/functional/verify/latest-missing/lines-checked @@ -1,3 +1,2 @@ -Attempting to download version string to memory Unable to get latest version for install Error: Fix did not fully succeed