Add new orphan tests for bundle deletes

When a bundle is removed, ensure the new orphans created are detected
by bundle-list and bundle-remove.

Signed-off-by: William Douglas <william.douglas@intel.com>

Author: William Douglas

test/functional/bundlelist/list-orphans.bats

@@ -16,6 +16,9 @@ setup_file() {
 	create_bundle -L    -n test-bundle6 -f /file6 "$TEST_NAME"
 	add_dependency_to_manifest "$WEB_DIR"/10/Manifest.test-bundle3 test-bundle4
 
+	create_version -r "$TEST_NAME" 20 10
+	remove_from_manifest "$WEB_DIR"/20/Manifest.MoM test-bundle3
+
 }
 
 teardown_file() {
@@ -63,3 +66,49 @@ teardown_file() {
 	assert_is_output "$expected_output"
 
 }
+
+@test "LST030: Update deleting a bundle shows new orphans" {
+
+	run sudo sh -c "$SWUPD update $SWUPD_OPTS"
+	assert_status_is 0
+	expected_output=$(cat <<-EOM
+		Update started
+		Preparing to update from 10 to 20
+		Downloading packs for:
+		 - os-core
+		Finishing packs extraction...
+		Statistics for going from version 10 to version 20:
+		    changed bundles   : 1
+		    new bundles       : 0
+		    deleted bundles   : 1
+		    changed files     : 0
+		    new files         : 7
+		    deleted files     : 2
+		Validate downloaded files
+		No extra files need to be downloaded
+		Installing files...
+		Update was applied
+		Calling post-update helper scripts
+		Update successful - System updated from version 10 to version 20
+	EOM
+	)
+	assert_is_output "$expected_output"
+	# bundle should not exist
+	assert_file_not_exists "$TARGET_DIR"/file_3
+	assert_file_not_exists "$TARGET_DIR"/usr/share/clear/bundles/test-bundle3
+
+        run sudo sh -c "$SWUPD bundle-list $SWUPD_OPTS --orphans"
+	assert_status_is "$SWUPD_OK"
+	expected_output=$(cat <<-EOM
+		Loading required manifests...
+		Orphan bundles:
+		 - test-bundle4
+		 - test-bundle5
+		 - test-bundle6
+		Total: 3
+		Use "swupd bundle-add BUNDLE" to no longer list BUNDLE and its dependencies as orphaned
+	EOM
+	)
+	assert_is_output "$expected_output"
+
+}

test/functional/bundleremove/remove-orphans.bats

@@ -13,9 +13,13 @@ test_setup() {
 	create_bundle -L    -n test-bundle3 -f /file3 "$TEST_NAME"
 	create_bundle -L    -n test-bundle4 -f /file4 "$TEST_NAME"
 	create_bundle -L    -n test-bundle5 -f /file5 "$TEST_NAME"
+	sudo touch "$state_path"/bundles/os-core
 	add_dependency_to_manifest "$WEB_DIR"/10/Manifest.test-bundle1 test-bundle2
 	add_dependency_to_manifest "$WEB_DIR"/10/Manifest.test-bundle4 test-bundle5
 
+	create_version -r "$TEST_NAME" 20 10
+	remove_from_manifest "$WEB_DIR"/20/Manifest.MoM test-bundle1
+
 }
 
 @test "REM030: Remove orphan bundles" {
@@ -56,3 +60,51 @@ test_setup() {
 	assert_in_output "$expected_output"
 
 }
+
+@test "REM033: Update deleting bundle adds new orphans that are removed" {
+
+	run sudo sh -c "$SWUPD update $SWUPD_OPTS"
+	assert_status_is 0
+	expected_output=$(cat <<-EOM
+		Update started
+		Preparing to update from 10 to 20
+		Downloading packs for:
+		 - os-core
+		Finishing packs extraction...
+		Statistics for going from version 10 to version 20:
+		    changed bundles   : 1
+		    new bundles       : 0
+		    deleted bundles   : 1
+		    changed files     : 0
+		    new files         : 7
+		    deleted files     : 2
+		Validate downloaded files
+		No extra files need to be downloaded
+		Installing files...
+		Update was applied
+		Calling post-update helper scripts
+		Update successful - System updated from version 10 to version 20
+	EOM
+	)
+	assert_is_output "$expected_output"
+	# bundle should not exist
+	assert_file_not_exists "$TARGET_DIR"/file_1
+	assert_file_not_exists "$TARGET_DIR"/usr/share/clear/bundles/test-bundle1
+
+	run sudo sh -c "$SWUPD bundle-remove $SWUPD_OPTS --orphans"
+
+	assert_status_is "$SWUPD_OK"
+	expected_output=$(cat <<-EOM
+		The following bundles are being removed:
+		 - test-bundle5
+		 - test-bundle4
+		 - test-bundle3
+		 - test-bundle2
+		Deleting bundle files...
+		Total deleted files: 8
+		Successfully removed 4 bundles
+	EOM
+	)
+	assert_is_output "$expected_output"
+
+}