From 190f473b044262be14eab84d2a6e83e5ed3eebf3 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Thu, 8 Jul 2021 01:22:36 +0200
Subject: [PATCH] distro/rhel85: update unit tests

---
 internal/distro/rhel85/distro_test.go  | 85 ++++++++++++++++++++++++--
 internal/distro/rhel85/package_sets.go |  2 +-
 2 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/internal/distro/rhel85/distro_test.go b/internal/distro/rhel85/distro_test.go
index 44c3b2e01..5b14239d1 100644
--- a/internal/distro/rhel85/distro_test.go
+++ b/internal/distro/rhel85/distro_test.go
@@ -35,6 +35,42 @@ func TestFilenameFromType(t *testing.T) {
 		want1   string
 		wantErr bool
 	}{
+		{
+			name:  "qcow2",
+			args:  args{"qcow2"},
+			want:  "disk.qcow2",
+			want1: "application/x-qemu-disk",
+		},
+		{
+			name:  "openstack",
+			args:  args{"openstack"},
+			want:  "disk.qcow2",
+			want1: "application/x-qemu-disk",
+		},
+		{
+			name:  "vhd",
+			args:  args{"vhd"},
+			want:  "disk.vhd",
+			want1: "application/x-vhd",
+		},
+		{
+			name:  "vmdk",
+			args:  args{"vmdk"},
+			want:  "disk.vmdk",
+			want1: "application/x-vmdk",
+		},
+		{
+			name:  "tar",
+			args:  args{"tar"},
+			want:  "root.tar.xz",
+			want1: "application/x-tar",
+		},
+		{
+			name:  "tar-installer",
+			args:  args{"tar-installer"},
+			want:  "installer.iso",
+			want1: "application/x-iso9660-image",
+		},
 		{
 			name:  "edge-container",
 			args:  args{"edge-container"},
@@ -139,17 +175,41 @@ func TestImageType_Name(t *testing.T) {
 		{
 			arch: "x86_64",
 			imgNames: []string{
+				"qcow2",
+				"openstack",
+				"vhd",
+				"vmdk",
+				"ami",
 				"edge-commit",
 				"edge-container",
 				"edge-installer",
+				"tar",
+				"tar-installer",
 			},
 		},
 		{
 			arch: "aarch64",
 			imgNames: []string{
+				"qcow2",
+				"openstack",
+				"ami",
 				"edge-commit",
 				"edge-container",
-				"edge-installer",
+				"tar",
+			},
+		},
+		{
+			arch: "ppc64le",
+			imgNames: []string{
+				"qcow2",
+				"tar",
+			},
+		},
+		{
+			arch: "s390x",
+			imgNames: []string{
+				"qcow2",
+				"tar",
 			},
 		},
 	}
@@ -224,6 +284,11 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 		{
 			arch: "x86_64",
 			imgNames: []string{
+				"qcow2",
+				"openstack",
+				"vhd",
+				"vmdk",
+				"ami",
 				"edge-commit",
 				"edge-container",
 				"edge-installer",
@@ -234,19 +299,27 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
 		{
 			arch: "aarch64",
 			imgNames: []string{
+				"qcow2",
+				"openstack",
+				"ami",
 				"edge-commit",
 				"edge-container",
-				"edge-installer",
 				"tar",
 			},
 		},
 		{
-			arch:     "ppc64le",
-			imgNames: []string{"tar"},
+			arch: "ppc64le",
+			imgNames: []string{
+				"qcow2",
+				"tar",
+			},
 		},
 		{
-			arch:     "s390x",
-			imgNames: []string{"tar"},
+			arch: "s390x",
+			imgNames: []string{
+				"qcow2",
+				"tar",
+			},
 		},
 	}
 
diff --git a/internal/distro/rhel85/package_sets.go b/internal/distro/rhel85/package_sets.go
index 009d0d4dd..271007470 100644
--- a/internal/distro/rhel85/package_sets.go
+++ b/internal/distro/rhel85/package_sets.go
@@ -174,7 +174,7 @@ func openstackCommonPackageSet() rpmmd.PackageSet {
 func amiCommonPackageSet() rpmmd.PackageSet {
 	return rpmmd.PackageSet{
 		Include: []string{
-			"@core", "cloud-init", "cloud-utils-growpart", "clyum-utils",
+			"@core", "cloud-init", "cloud-utils-growpart", "yum-utils",
 			"dracut-config-generic", "dracut-norescue", "gdisk", "grub2",
 			"insights-client", "NetworkManager", "NetworkManager-cloud-setup",
 			"redhat-release", "redhat-release-eula", "rsync", "tar",