From 0d99b3dad64893dd1bdc92e6149aa8eacda6b19d Mon Sep 17 00:00:00 2001
From: Castulo Martinez <castulo.martinez@intel.com>
Date: Wed, 31 Oct 2018 20:24:41 +0000
Subject: [PATCH 1/2] Tests for verify and verify --fix consistency

This commit adds some tests to validate consistency
between "swupd verify" and "swupd verify --fix".

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
---
 Makefile.am                            |   1 +
 test/functional/verify/verify-fix.bats | 226 +++++++++++++++++++++++++
 2 files changed, 227 insertions(+)
 create mode 100755 test/functional/verify/verify-fix.bats

diff --git a/Makefile.am b/Makefile.am
index 2a098c5dc..eb9b294d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,6 +199,7 @@ BATS = \
 	test/functional/verify/verify-client-certificate.bats \
 	test/functional/verify/verify-directory-tree-deleted.bats \
 	test/functional/verify/verify-empty-dir-deleted.bats \
+	test/functional/verify/verify-fix.bats \
 	test/functional/verify/verify-fix-version-mismatch.bats \
 	test/functional/verify/verify-fix-version-mismatch-override.bats \
 	test/functional/verify/verify-format-mismatch.bats \
diff --git a/test/functional/verify/verify-fix.bats b/test/functional/verify/verify-fix.bats
new file mode 100755
index 000000000..52a422fd3
--- /dev/null
+++ b/test/functional/verify/verify-fix.bats
@@ -0,0 +1,226 @@
+#!/usr/bin/env bats
+
+# Author: Castulo Martinez
+# Email: castulo.martinez@intel.com
+
+load "../testlib"
+
+test_setup() {
+
+	create_test_environment -r "$TEST_NAME" 10 1
+	create_bundle -L -n test-bundle1 -f /foo/file_1,/bar/file_2 "$TEST_NAME"
+	create_version "$TEST_NAME" 20 10 1
+	update_bundle -p "$TEST_NAME" test-bundle1 --update /foo/file_1
+	update_bundle -p "$TEST_NAME" test-bundle1 --delete /bar/file_2
+	update_bundle "$TEST_NAME" test-bundle1 --add /baz/file_3
+	set_current_version "$TEST_NAME" 20
+	# adding an untracked files into an untracked directory (/bat)
+	sudo mkdir "$TARGETDIR"/bat
+	sudo touch "$TARGETDIR"/bat/untracked_file1
+	# adding an untracked file into tracked directory (/bar)
+	sudo touch "$TARGETDIR"/bar/untracked_file2
+	# adding an untracked file into /usr
+	sudo touch "$TARGETDIR"/usr/untracked_file3
+
+}
+
+@test "Verify shows modified files, new files and deleted files" {
+
+	# verify should show tracked files with a hash mismatch,
+	# it should also show tracked files that were marked to be removed,
+	# and it should show files that were added to bundles.
+	# verify should not show any of these changes in untracked files
+
+	run sudo sh -c "$SWUPD verify $SWUPD_OPTS"
+
+	assert_status_is 0
+	expected_output=$(cat <<-EOM
+		Verifying version 20
+		Verifying files
+		Missing file: .*/target-dir/baz
+		Missing file: .*/target-dir/baz/file_3
+		Hash mismatch for file: .*/target-dir/foo/file_1
+		Hash mismatch for file: .*/target-dir/usr/lib/os-release
+		File that should be deleted: .*/target-dir/bar/file_2
+		Inspected 18 files
+		  2 files were missing
+		  2 files did not match
+		  1 file found which should be deleted
+		Verify successful
+	EOM
+	)
+	assert_regex_is_output "$expected_output"
+	# tracked files
+	assert_file_exists "$TARGETDIR"/foo/file_1
+	assert_file_exists "$TARGETDIR"/bar/file_2
+	assert_file_not_exists "$TARGETDIR"/baz/file_3
+	# untracked files
+	assert_file_exists "$TARGETDIR"/bat/untracked_file1
+	assert_file_exists "$TARGETDIR"/bar/untracked_file2
+	assert_file_exists "$TARGETDIR"/usr/untracked_file3
+
+}
+
+@test "Verify fixes modified files, new files and deleted files" {
+
+	# verify --fix should fix tracked files with a hash mismatch,
+	# it should also delete tracked files that were marked to be removed,
+	# and it should add files that were added to bundles.
+	# verify --fix should not delete any untracked files
+
+	run sudo sh -c "$SWUPD verify --fix $SWUPD_OPTS"
+
+	assert_status_is 0
+	expected_output=$(cat <<-EOM
+		Verifying version 20
+		Verifying files
+		Starting download of remaining update content. This may take a while...
+		Finishing download of update content...
+		Adding any missing files
+		Missing file: .*/target-dir/baz
+		.fixed
+		Missing file: .*/target-dir/baz/file_3
+		.fixed
+		Fixing modified files
+		Hash mismatch for file: .*/target-dir/foo/file_1
+		.fixed
+		Hash mismatch for file: .*/target-dir/usr/lib/os-release
+		.fixed
+		File that should be deleted: .*/target-dir/bar/file_2
+		.deleted
+		Inspected 18 files
+		  2 files were missing
+		    2 of 2 missing files were replaced
+		    0 of 2 missing files were not replaced
+		  2 files did not match
+		    2 of 2 files were fixed
+		    0 of 2 files were not fixed
+		  1 file found which should be deleted
+		    1 of 1 files were deleted
+		    0 of 1 files were not deleted
+		Calling post-update helper scripts.
+		Fix successful
+	EOM
+	)
+	assert_regex_is_output "$expected_output"
+	# tracked files
+	assert_file_exists "$TARGETDIR"/foo/file_1
+	assert_file_not_exists "$TARGETDIR"/bar/file_2
+	assert_file_exists "$TARGETDIR"/baz/file_3
+	# untracked files
+	assert_file_exists "$TARGETDIR"/bat/untracked_file1
+	assert_file_exists "$TARGETDIR"/bar/untracked_file2
+	assert_file_exists "$TARGETDIR"/usr/untracked_file3
+
+}
+
+@test "Verify fixes modified files, new files, deleted files, and removes untracked files" {
+
+	# verify --fix --picky should fix tracked files with a hash mismatch,
+	# it should also delete tracked files that were marked to be removed,
+	# and it should add files that were added to bundles.
+	# verify --fix --picky should delete any untracked files within /usr
+
+	run sudo sh -c "$SWUPD verify --fix --picky $SWUPD_OPTS"
+
+	assert_status_is 0
+	expected_output=$(cat <<-EOM
+		Verifying version 20
+		Verifying files
+		Starting download of remaining update content. This may take a while...
+		Finishing download of update content...
+		Adding any missing files
+		Missing file: .*/target-dir/baz
+		.fixed
+		Missing file: .*/target-dir/baz/file_3
+		.fixed
+		Fixing modified files
+		Hash mismatch for file: .*/target-dir/foo/file_1
+		.fixed
+		Hash mismatch for file: .*/target-dir/usr/lib/os-release
+		.fixed
+		File that should be deleted: .*/target-dir/bar/file_2
+		.deleted
+		--picky removing extra files under .*/target-dir/usr
+		REMOVING /usr/untracked_file3
+		Inspected 19 files
+		  2 files were missing
+		    2 of 2 missing files were replaced
+		    0 of 2 missing files were not replaced
+		  2 files did not match
+		    2 of 2 files were fixed
+		    0 of 2 files were not fixed
+		  2 files found which should be deleted
+		    2 of 2 files were deleted
+		    0 of 2 files were not deleted
+		Calling post-update helper scripts.
+		Fix successful
+	EOM
+	)
+	assert_regex_is_output "$expected_output"
+	# tracked files
+	assert_file_exists "$TARGETDIR"/foo/file_1
+	assert_file_not_exists "$TARGETDIR"/bar/file_2
+	assert_file_exists "$TARGETDIR"/baz/file_3
+	# untracked files
+	assert_file_exists "$TARGETDIR"/bat/untracked_file1
+	assert_file_exists "$TARGETDIR"/bar/untracked_file2
+	assert_file_not_exists "$TARGETDIR"/usr/untracked_file3
+
+}
+
+@test "Verify fixes modified files, new files, deleted files, and removes untracked files from a specified location" {
+
+	# verify --fix --picky should fix tracked files with a hash mismatch,
+	# it should also delete tracked files that were marked to be removed,
+	# and it should add files that were added to bundles.
+	# verify --fix --picky-tree=/bat should delete any untracked files within /bat
+
+	run sudo sh -c "$SWUPD verify --fix --picky --picky-tree=/bat $SWUPD_OPTS"
+
+	assert_status_is 0
+	expected_output=$(cat <<-EOM
+		Verifying version 20
+		Verifying files
+		Starting download of remaining update content. This may take a while...
+		Finishing download of update content...
+		Adding any missing files
+		Missing file: .*/target-dir/baz
+		.fixed
+		Missing file: .*/target-dir/baz/file_3
+		.fixed
+		Fixing modified files
+		Hash mismatch for file: .*/target-dir/foo/file_1
+		.fixed
+		Hash mismatch for file: .*/target-dir/usr/lib/os-release
+		.fixed
+		File that should be deleted: .*/target-dir/bar/file_2
+		.deleted
+		--picky removing extra files under .*/target-dir/bat
+		REMOVING /bat/untracked_file1
+		REMOVING DIR /bat/
+		Inspected 20 files
+		  2 files were missing
+		    2 of 2 missing files were replaced
+		    0 of 2 missing files were not replaced
+		  2 files did not match
+		    2 of 2 files were fixed
+		    0 of 2 files were not fixed
+		  3 files found which should be deleted
+		    3 of 3 files were deleted
+		    0 of 3 files were not deleted
+		Calling post-update helper scripts.
+		Fix successful
+	EOM
+	)
+	assert_regex_is_output "$expected_output"
+	# tracked files
+	assert_file_exists "$TARGETDIR"/foo/file_1
+	assert_file_not_exists "$TARGETDIR"/bar/file_2
+	assert_file_exists "$TARGETDIR"/baz/file_3
+	# untracked files
+	assert_file_not_exists "$TARGETDIR"/bat/untracked_file1
+	assert_file_exists "$TARGETDIR"/bar/untracked_file2
+	assert_file_exists "$TARGETDIR"/usr/untracked_file3
+
+}

From d1f174f30292c72283f3e44f8b537c10aa03e84f Mon Sep 17 00:00:00 2001
From: Castulo Martinez <castulo.martinez@intel.com>
Date: Mon, 5 Nov 2018 18:25:43 +0000
Subject: [PATCH 2/2] Add consistency between verify and verify --fix

Running "swupd verify" should be a dry-run of running
"swupd verify --fix", meaning that "swupd verify" should find
the same issues to be resolved than "swupd verify --fix" but it
should just inform about them while --fix should inform + fix them.
In occasions this does not happen, for example when there are
tracked files that need to be removed from the system.

This commit fixes that.

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
---
 src/extra_files.c                             |  3 +-
 src/verify.c                                  | 92 +++++++++++--------
 .../verify/verify-add-missing-directory.bats  |  3 +-
 .../verify-add-missing-include-old.bats       |  1 -
 .../verify/verify-add-missing-include.bats    |  1 -
 .../verify/verify-boot-file-deleted.bats      |  4 +-
 .../verify/verify-boot-file-mismatch-fix.bats |  4 +-
 .../verify/verify-boot-file-mismatch.bats     |  2 +-
 test/functional/verify/verify-boot-skip.bats  |  4 +-
 .../verify-check-missing-directory.bats       |  4 +-
 .../verify/verify-directory-tree-deleted.bats | 12 ++-
 .../verify/verify-empty-dir-deleted.bats      |  8 +-
 .../verify-fix-version-mismatch-override.bats |  3 +-
 .../verify-format-mismatch-override.bats      |  3 +-
 test/functional/verify/verify-ghosted.bats    |  4 +-
 .../verify/verify-install-directory.bats      |  2 +-
 .../verify-install-latest-directory.bats      |  2 +-
 .../verify/verify-picky-downgrade.bats        | 14 +--
 .../verify/verify-picky-ghosted-missing.bats  |  6 +-
 .../verify/verify-picky-ghosted.bats          |  6 +-
 .../verify/verify-skip-scripts.bats           |  4 +-
 21 files changed, 89 insertions(+), 93 deletions(-)

diff --git a/src/extra_files.c b/src/extra_files.c
index 47b637959..f412ac656 100644
--- a/src/extra_files.c
+++ b/src/extra_files.c
@@ -154,6 +154,8 @@ int walk_tree(struct manifest *manifest, const char *start, bool fix, const rege
 		int skip_len; /* Length of directory name we are skipping
 			       * could have used strlen(skip_dir), but speed! */
 		if (!F[i].in_manifest) {
+			/* Account for these files not in the manifest as inspected also */
+			counts->checked++;
 			counts->extraneous++;
 			/* Logic to avoid printing out all the files in a
 			 * directory when the directory itself is not present */
@@ -180,7 +182,6 @@ int walk_tree(struct manifest *manifest, const char *start, bool fix, const rege
 			skip_dir = NULL;
 		}
 	}
-	counts->checked = nF;
 tidy:
 	for (int i = 0; i < nF; i++) {
 		free_string(&F[i].filename);
diff --git a/src/verify.c b/src/verify.c
index 2dc2f423b..f47f23d1b 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -339,8 +339,6 @@ static int get_all_files(struct manifest *official_manifest, struct list *subs)
 		if (file->is_deleted) {
 			continue;
 		}
-
-		counts.checked++;
 	}
 	return 0;
 }
@@ -451,7 +449,7 @@ static void check_warn_freespace(const struct file *file)
 }
 
 /* for each missing but expected file, (re)add the file */
-static void add_missing_files(struct manifest *official_manifest)
+static void add_missing_files(struct manifest *official_manifest, bool repair)
 {
 	int ret;
 	struct file local;
@@ -487,7 +485,7 @@ static void add_missing_files(struct manifest *official_manifest)
 		/* compare the hash and report mismatch */
 		if (hash_is_zeros(local.hash)) {
 			counts.missing++;
-			if (cmdline_option_install == false) {
+			if (!repair || (repair && cmdline_option_install == false)) {
 				/* Log to stdout, so we can post-process */
 				printf("\nMissing file: %s\n", fullname);
 			}
@@ -496,6 +494,11 @@ static void add_missing_files(struct manifest *official_manifest)
 			continue;
 		}
 
+		/* if not repairing, we're done */
+		if (!repair) {
+			goto out;
+		}
+
 		/* install the new file (on miscompare + fix) */
 		ret = do_staging(file, official_manifest);
 		if (ret == 0) {
@@ -522,6 +525,7 @@ static void add_missing_files(struct manifest *official_manifest)
 				printf("\n\tfixed\n");
 			}
 		}
+	out:
 		free_string(&fullname);
 		print_progress(complete, list_length);
 	}
@@ -535,15 +539,7 @@ static void check_and_fix_one(struct file *file, struct manifest *official_manif
 	int ret;
 
 	// Note: boot files not marked as deleted are candidates for verify/fix
-	if (file->is_deleted ||
-	    ignore(file)) {
-		return;
-	}
-
-	counts.checked++;
-
-	// do_not_update set by earlier check, so account as checked
-	if (file->do_not_update) {
+	if (file->is_deleted || ignore(file) || file->do_not_update) {
 		return;
 	}
 
@@ -552,9 +548,13 @@ static void check_and_fix_one(struct file *file, struct manifest *official_manif
 	if (verify_file(file, fullname)) {
 		goto end;
 	}
-	counts.mismatch++;
-	/* Log to stdout, so we can post-process it */
-	printf("\nHash mismatch for file: %s\n", fullname);
+	// do not account for missing files at this point, they are
+	// accounted for in a different stage, only account for mismatch
+	if (access(fullname, F_OK) == 0) {
+		counts.mismatch++;
+		/* Log to stdout, so we can post-process it */
+		printf("\nHash mismatch for file: %s\n", fullname);
+	}
 
 	/* if not repairing, we're done */
 	if (!repair) {
@@ -602,7 +602,7 @@ static void deal_with_hash_mismatches(struct manifest *official_manifest, bool r
 	printf("\n"); /* Finish update progress message */
 }
 
-static void remove_orphaned_files(struct manifest *official_manifest)
+static void remove_orphaned_files(struct manifest *official_manifest, bool repair)
 {
 	int ret;
 	struct list *iter;
@@ -638,11 +638,16 @@ static void remove_orphaned_files(struct manifest *official_manifest)
 
 		if (lstat(fullname, &sb) != 0) {
 			/* correctly, the file is not present */
-			free_string(&fullname);
-			continue;
+			goto out;
 		}
 
 		counts.extraneous++;
+		printf("File that should be deleted: %s\n", fullname);
+
+		/* if not repairing, we're done */
+		if (!repair) {
+			goto out;
+		}
 
 		fd = get_dirfd_path(fullname);
 		if (fd < 0) {
@@ -660,7 +665,7 @@ static void remove_orphaned_files(struct manifest *official_manifest)
 				fprintf(stderr, "Failed to remove %s (%i: %s)\n", fullname, errno, strerror(errno));
 				counts.not_deleted++;
 			} else {
-				fprintf(stderr, "Deleted %s\n", fullname);
+				fprintf(stderr, "\tdeleted\n");
 				counts.deleted++;
 			}
 		} else {
@@ -675,12 +680,13 @@ static void remove_orphaned_files(struct manifest *official_manifest)
 					fprintf(stderr, "Couldn't remove directory containing untracked files: %s\n", fullname);
 				}
 			} else {
-				fprintf(stderr, "Deleted %s\n", fullname);
+				fprintf(stderr, "\tdeleted\n");
 				counts.deleted++;
 			}
 		}
-		free_string(&fullname);
 		close(fd);
+	out:
+		free_string(&fullname);
 	}
 }
 
@@ -714,7 +720,7 @@ int verify_main(int argc, char **argv)
 		goto clean_args_and_exit;
 	}
 
-	/* Gather current manifests */
+	/* Get the current system version and the version to verify against */
 	int sys_version = get_current_version(path_prefix);
 	if (!version) {
 		if (sys_version < 0) {
@@ -725,6 +731,7 @@ int verify_main(int argc, char **argv)
 		version = sys_version;
 	}
 
+	/* If "latest" was chosen, get latest version */
 	if (version == -1) {
 		version = get_latest_version(NULL);
 		if (version < 0) {
@@ -750,6 +757,7 @@ int verify_main(int argc, char **argv)
 
 	timelist_timer_start(global_times, "Load and recurse Manifests");
 
+	/* Gather current manifests */
 	/* When the version we are verifying against does not match our system version
 	 * disable checks for mixer state so the user can easily switch back to their
 	 * normal update stream */
@@ -848,10 +856,13 @@ int verify_main(int argc, char **argv)
 	timelist_timer_stop(global_times);
 	timelist_timer_start(global_times, "Consolidate files from bundles");
 	official_manifest->files = files_from_bundles(official_manifest->submanifests);
-
 	official_manifest->files = consolidate_files(official_manifest->files);
 	timelist_timer_stop(global_times);
 	timelist_timer_start(global_times, "Get required files");
+
+	/* get the initial number of files to be inspected */
+	counts.checked = list_len(official_manifest->files);
+
 	/* when fixing or installing we need input files. */
 	if (cmdline_option_fix || cmdline_option_install) {
 		ret = get_required_files(official_manifest, subs);
@@ -884,9 +895,11 @@ int verify_main(int argc, char **argv)
 		 * is already there. It's also the most safe operation, adding files rarely
 		 * has unintended side effect. So lets do the safest thing first.
 		 */
+		bool repair = true;
+
 		timelist_timer_start(global_times, "Add missing files");
 		fprintf(stderr, "Adding any missing files\n");
-		add_missing_files(official_manifest);
+		add_missing_files(official_manifest, repair);
 		timelist_timer_stop(global_times);
 	}
 
@@ -905,7 +918,7 @@ int verify_main(int argc, char **argv)
 		/* removing files could be risky, so only do it if the
 		 * prior phases had no problems */
 		if ((counts.not_fixed == 0) && (counts.not_replaced == 0)) {
-			remove_orphaned_files(official_manifest);
+			remove_orphaned_files(official_manifest, repair);
 		}
 		if (cmdline_option_picky) {
 			char *start = mk_full_filename(path_prefix, cmdline_option_picky_tree);
@@ -923,7 +936,12 @@ int verify_main(int argc, char **argv)
 		bool repair = false;
 
 		fprintf(stderr, "Verifying files\n");
-		deal_with_hash_mismatches(official_manifest, repair);
+		add_missing_files(official_manifest, repair);
+		/* quick only checks for missing files, so it is done here */
+		if (!cmdline_option_quick) {
+			deal_with_hash_mismatches(official_manifest, repair);
+			remove_orphaned_files(official_manifest, repair);
+		}
 	}
 
 brick_the_system_and_clean_curl:
@@ -934,29 +952,27 @@ int verify_main(int argc, char **argv)
 	 */
 
 	/* report a summary of what we managed to do and not do */
-	fprintf(stderr, "Inspected %i files\n", counts.checked);
+	fprintf(stderr, "Inspected %i file%s\n", counts.checked, (counts.checked == 1 ? "" : "s"));
 
-	if (cmdline_option_fix || cmdline_option_install) {
-		fprintf(stderr, "  %i files were missing\n", counts.missing);
-		if (counts.missing) {
+	if (counts.missing) {
+		fprintf(stderr, "  %i file%s %s missing\n", counts.missing, (counts.missing > 1 ? "s" : ""), (counts.missing > 1 ? "were" : "was"));
+		if (cmdline_option_fix || cmdline_option_install) {
 			fprintf(stderr, "    %i of %i missing files were replaced\n", counts.replaced, counts.missing);
 			fprintf(stderr, "    %i of %i missing files were not replaced\n", counts.not_replaced, counts.missing);
 		}
 	}
 
-	if (!cmdline_option_quick && counts.mismatch > 0) {
-		fprintf(stderr, "  %i files did not match\n", counts.mismatch);
+	if (counts.mismatch) {
+		fprintf(stderr, "  %i file%s did not match\n", counts.mismatch, (counts.mismatch > 1 ? "s" : ""));
 		if (cmdline_option_fix) {
 			fprintf(stderr, "    %i of %i files were fixed\n", counts.fixed, counts.mismatch);
 			fprintf(stderr, "    %i of %i files were not fixed\n", counts.not_fixed, counts.mismatch);
 		}
 	}
 
-	if (((counts.not_fixed == 0) && (counts.not_replaced == 0) &&
-	     cmdline_option_fix && !cmdline_option_quick) ||
-	    (!cmdline_option_fix && cmdline_option_picky)) {
-		fprintf(stderr, "  %i files found which should be deleted\n", counts.extraneous);
-		if (counts.extraneous) {
+	if (counts.extraneous) {
+		fprintf(stderr, "  %i file%s found which should be deleted\n", counts.extraneous, (counts.extraneous > 1 ? "s" : ""));
+		if (cmdline_option_fix) {
 			fprintf(stderr, "    %i of %i files were deleted\n", counts.deleted, counts.extraneous);
 			fprintf(stderr, "    %i of %i files were not deleted\n", counts.not_deleted, counts.extraneous);
 		}
diff --git a/test/functional/verify/verify-add-missing-directory.bats b/test/functional/verify/verify-add-missing-directory.bats
index 7c7cea44c..1ac0eba38 100755
--- a/test/functional/verify/verify-add-missing-directory.bats
+++ b/test/functional/verify/verify-add-missing-directory.bats
@@ -25,10 +25,9 @@ test_setup() {
 		.fixed
 		Fixing modified files
 		Inspected 5 files
-		  1 files were missing
+		  1 file was missing
 		    1 of 1 missing files were replaced
 		    0 of 1 missing files were not replaced
-		  0 files found which should be deleted
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-add-missing-include-old.bats b/test/functional/verify/verify-add-missing-include-old.bats
index 75c073859..86067ebae 100755
--- a/test/functional/verify/verify-add-missing-include-old.bats
+++ b/test/functional/verify/verify-add-missing-include-old.bats
@@ -33,7 +33,6 @@ test_setup() {
 		  2 files were missing
 		    2 of 2 missing files were replaced
 		    0 of 2 missing files were not replaced
-		  0 files found which should be deleted
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-add-missing-include.bats b/test/functional/verify/verify-add-missing-include.bats
index a4f41ba85..fc987b461 100755
--- a/test/functional/verify/verify-add-missing-include.bats
+++ b/test/functional/verify/verify-add-missing-include.bats
@@ -34,7 +34,6 @@ test_setup() {
 		  3 files were missing
 		    3 of 3 missing files were replaced
 		    0 of 3 missing files were not replaced
-		  0 files found which should be deleted
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-boot-file-deleted.bats b/test/functional/verify/verify-boot-file-deleted.bats
index 232cf5194..363531343 100755
--- a/test/functional/verify/verify-boot-file-deleted.bats
+++ b/test/functional/verify/verify-boot-file-deleted.bats
@@ -20,9 +20,7 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		Inspected 4 files
-		  0 files were missing
-		  0 files found which should be deleted
+		Inspected 5 files
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-boot-file-mismatch-fix.bats b/test/functional/verify/verify-boot-file-mismatch-fix.bats
index 555070e95..b6e093103 100755
--- a/test/functional/verify/verify-boot-file-mismatch-fix.bats
+++ b/test/functional/verify/verify-boot-file-mismatch-fix.bats
@@ -25,11 +25,9 @@ test_setup() {
 		Hash mismatch for file: .*/target-dir/usr/lib/kernel/testfile
 		.fixed
 		Inspected 7 files
-		  0 files were missing
-		  1 files did not match
+		  1 file did not match
 		    1 of 1 files were fixed
 		    0 of 1 files were not fixed
-		  0 files found which should be deleted
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-boot-file-mismatch.bats b/test/functional/verify/verify-boot-file-mismatch.bats
index a47c9372c..fa52e185d 100755
--- a/test/functional/verify/verify-boot-file-mismatch.bats
+++ b/test/functional/verify/verify-boot-file-mismatch.bats
@@ -20,7 +20,7 @@ test_setup() {
 		Verifying files
 		Hash mismatch for file: .*/target-dir/usr/lib/kernel/testfile
 		Inspected 7 files
-		  1 files did not match
+		  1 file did not match
 		Verify successful
 	EOM
 	)
diff --git a/test/functional/verify/verify-boot-skip.bats b/test/functional/verify/verify-boot-skip.bats
index e4fb17af2..c6dc770a1 100755
--- a/test/functional/verify/verify-boot-skip.bats
+++ b/test/functional/verify/verify-boot-skip.bats
@@ -20,9 +20,7 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		Inspected 4 files
-		  0 files were missing
-		  0 files found which should be deleted
+		Inspected 5 files
 		Calling post-update helper scripts.
 		WARNING: boot files update skipped due to --no-boot-update argument
 		Fix successful
diff --git a/test/functional/verify/verify-check-missing-directory.bats b/test/functional/verify/verify-check-missing-directory.bats
index 39d8defb2..61039677a 100755
--- a/test/functional/verify/verify-check-missing-directory.bats
+++ b/test/functional/verify/verify-check-missing-directory.bats
@@ -18,9 +18,9 @@ test_setup() {
 	expected_output=$(cat <<-EOM
 		Verifying version 10
 		Verifying files
-		Hash mismatch for file: .*/target-dir/foo
+		Missing file: .*/target-dir/foo
 		Inspected 4 files
-		  1 files did not match
+		  1 file was missing
 		Verify successful
 	EOM
 	)
diff --git a/test/functional/verify/verify-directory-tree-deleted.bats b/test/functional/verify/verify-directory-tree-deleted.bats
index 9afc8c515..b21bd3ac5 100755
--- a/test/functional/verify/verify-directory-tree-deleted.bats
+++ b/test/functional/verify/verify-directory-tree-deleted.bats
@@ -25,11 +25,13 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		Deleted .*/target-dir/testdir1/testdir2/testfile
-		Deleted .*/target-dir/testdir1/testdir2
-		Deleted .*/target-dir/testdir1
-		Inspected 1 files
-		  0 files were missing
+		File that should be deleted: .*/target-dir/testdir1/testdir2/testfile
+		.deleted
+		File that should be deleted: .*/target-dir/testdir1/testdir2
+		.deleted
+		File that should be deleted: .*/target-dir/testdir1
+		.deleted
+		Inspected 4 files
 		  3 files found which should be deleted
 		    3 of 3 files were deleted
 		    0 of 3 files were not deleted
diff --git a/test/functional/verify/verify-empty-dir-deleted.bats b/test/functional/verify/verify-empty-dir-deleted.bats
index 4386401bf..de533a2a2 100755
--- a/test/functional/verify/verify-empty-dir-deleted.bats
+++ b/test/functional/verify/verify-empty-dir-deleted.bats
@@ -20,10 +20,10 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		Deleted .*/target-dir/testdir
-		Inspected 1 files
-		  0 files were missing
-		  1 files found which should be deleted
+		File that should be deleted: .*/target-dir/testdir
+		.deleted
+		Inspected 2 files
+		  1 file found which should be deleted
 		    1 of 1 files were deleted
 		    0 of 1 files were not deleted
 		Calling post-update helper scripts.
diff --git a/test/functional/verify/verify-fix-version-mismatch-override.bats b/test/functional/verify/verify-fix-version-mismatch-override.bats
index d979bc3b1..a25716200 100755
--- a/test/functional/verify/verify-fix-version-mismatch-override.bats
+++ b/test/functional/verify/verify-fix-version-mismatch-override.bats
@@ -29,10 +29,9 @@ test_setup() {
 		.fixed
 		Fixing modified files
 		Inspected 3 files
-		  1 files were missing
+		  1 file was missing
 		    1 of 1 missing files were replaced
 		    0 of 1 missing files were not replaced
-		  0 files found which should be deleted
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-format-mismatch-override.bats b/test/functional/verify/verify-format-mismatch-override.bats
index a598fe71e..4f51f4409 100755
--- a/test/functional/verify/verify-format-mismatch-override.bats
+++ b/test/functional/verify/verify-format-mismatch-override.bats
@@ -32,13 +32,12 @@ test_setup() {
 		Hash mismatch for file: .*/target-dir/usr/share/defaults/swupd/format
 		.fixed
 		Inspected 12 files
-		  1 files were missing
+		  1 file was missing
 		    1 of 1 missing files were replaced
 		    0 of 1 missing files were not replaced
 		  2 files did not match
 		    2 of 2 files were fixed
 		    0 of 2 files were not fixed
-		  0 files found which should be deleted
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-ghosted.bats b/test/functional/verify/verify-ghosted.bats
index cadcd0d3c..bc7497ac7 100755
--- a/test/functional/verify/verify-ghosted.bats
+++ b/test/functional/verify/verify-ghosted.bats
@@ -19,9 +19,7 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		Inspected 1 files
-		  0 files were missing
-		  0 files found which should be deleted
+		Inspected 2 files
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-install-directory.bats b/test/functional/verify/verify-install-directory.bats
index ca4a8c66f..3ed56eb8f 100755
--- a/test/functional/verify/verify-install-directory.bats
+++ b/test/functional/verify/verify-install-directory.bats
@@ -25,7 +25,7 @@ test_setup() {
 		Finishing download of update content...
 		Adding any missing files
 		Inspected 5 files
-		  1 files were missing
+		  1 file was missing
 		    1 of 1 missing files were replaced
 		    0 of 1 missing files were not replaced
 		Calling post-update helper scripts.
diff --git a/test/functional/verify/verify-install-latest-directory.bats b/test/functional/verify/verify-install-latest-directory.bats
index deab5780a..db495ec8c 100755
--- a/test/functional/verify/verify-install-latest-directory.bats
+++ b/test/functional/verify/verify-install-latest-directory.bats
@@ -25,7 +25,7 @@ test_setup() {
 		Finishing download of update content...
 		Adding any missing files
 		Inspected 6 files
-		  1 files were missing
+		  1 file was missing
 		    1 of 1 missing files were replaced
 		    0 of 1 missing files were not replaced
 		Calling post-update helper scripts.
diff --git a/test/functional/verify/verify-picky-downgrade.bats b/test/functional/verify/verify-picky-downgrade.bats
index dd6f7a35e..abe52e0b7 100755
--- a/test/functional/verify/verify-picky-downgrade.bats
+++ b/test/functional/verify/verify-picky-downgrade.bats
@@ -56,9 +56,8 @@ test_setup() {
 		REMOVING /usr/foo/file_3
 		REMOVING /usr/foo/file_2
 		REMOVING DIR /usr/foo/
-		Inspected 15 files
-		  0 files were missing
-		  1 files did not match
+		Inspected 17 files
+		  1 file did not match
 		    1 of 1 files were fixed
 		    0 of 1 files were not fixed
 		  4 files found which should be deleted
@@ -99,9 +98,8 @@ test_setup() {
 		REMOVING /bar/file_5
 		REMOVING /bar/file_4
 		REMOVING DIR /bar/
-		Inspected 3 files
-		  0 files were missing
-		  1 files did not match
+		Inspected 16 files
+		  1 file did not match
 		    1 of 1 files were fixed
 		    0 of 1 files were not fixed
 		  3 files found which should be deleted
@@ -136,10 +134,8 @@ test_setup() {
 		/usr/foo/file_3
 		/usr/foo/file_2
 		/usr/foo/
-		Inspected 15 files
+		Inspected 17 files
 		  4 files found which should be deleted
-		    0 of 4 files were deleted
-		    4 of 4 files were not deleted
 		Verify successful
 	EOM
 	)
diff --git a/test/functional/verify/verify-picky-ghosted-missing.bats b/test/functional/verify/verify-picky-ghosted-missing.bats
index 5c641b0ca..00ad43efb 100755
--- a/test/functional/verify/verify-picky-ghosted-missing.bats
+++ b/test/functional/verify/verify-picky-ghosted-missing.bats
@@ -21,10 +21,8 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		--picky removing extra files under .*
-		Inspected 11 files
-		  0 files were missing
-		  0 files found which should be deleted
+		--picky removing extra files under .*/target-dir/usr
+		Inspected 13 files
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-picky-ghosted.bats b/test/functional/verify/verify-picky-ghosted.bats
index 6e7230403..9c4db3949 100755
--- a/test/functional/verify/verify-picky-ghosted.bats
+++ b/test/functional/verify/verify-picky-ghosted.bats
@@ -19,10 +19,8 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		--picky removing extra files under .*
-		Inspected 12 files
-		  0 files were missing
-		  0 files found which should be deleted
+		--picky removing extra files under .*/target-dir/usr
+		Inspected 13 files
 		Calling post-update helper scripts.
 		Fix successful
 	EOM
diff --git a/test/functional/verify/verify-skip-scripts.bats b/test/functional/verify/verify-skip-scripts.bats
index 9ead4516f..2c99e089b 100755
--- a/test/functional/verify/verify-skip-scripts.bats
+++ b/test/functional/verify/verify-skip-scripts.bats
@@ -22,9 +22,7 @@ test_setup() {
 		Verifying files
 		Adding any missing files
 		Fixing modified files
-		Inspected 6 files
-		  0 files were missing
-		  0 files found which should be deleted
+		Inspected 7 files
 		WARNING: post-update helper scripts skipped due to --no-scripts argument
 		Fix successful
 	EOM