Fix unit tests

Author: tremes

Makefile

@@ -10,7 +10,7 @@ test-unit:
 test-e2e:
 	go test ./test/integration -v -run ^\(TestIsIOHealthy\)$$ ^\(TestPullSecretExists\)$$ -timeout 6m30s
 	test/integration/resource_samples/apply.sh
-	go test ./test/integration -v -timeout 25m $(TEST_OPTIONS)
+	go test ./test/integration -v -timeout 40m $(TEST_OPTIONS)
 .PHONY: test-e2e
 
 vet:

pkg/gather/clusterconfig/container_runtime_configs_test.go

@@ -20,7 +20,9 @@ metadata:
     name: test-ContainerRC
 `
 	gvr := schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "containerruntimeconfigs"}
-	client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+		gvr: "ContainerRuntimeConfigsList",
+	})
 	decUnstructured := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 
 	testContainerRuntimeConfigs := &unstructured.Unstructured{}

pkg/gather/clusterconfig/install_plans_test.go

@@ -52,7 +52,7 @@ func TestGatherInstallPlans(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 
-			client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+			var client *dynamicfake.FakeDynamicClient
 			coreClient := kubefake.NewSimpleClientset()
 			for _, file := range test.testfiles {
 				f, err := os.Open(file)
@@ -86,6 +86,11 @@ func TestGatherInstallPlans(t *testing.T) {
 				if err != nil {
 					t.Fatal("unable to create ns fake ", err)
 				}
+				if client == nil {
+					client = dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+						gvr: "InstallPlansList",
+					})
+				}
 				_, err = client.Resource(gvr).Namespace(ns).Create(context.Background(), installplan, metav1.CreateOptions{})
 				if err != nil {
 					t.Fatal("unable to create installplan fake ", err)

pkg/gather/clusterconfig/machine_config_pools_test.go

@@ -20,7 +20,9 @@ metadata:
     name: master-t
 `
 	gvr := schema.GroupVersionResource{Group: "machineconfiguration.openshift.io", Version: "v1", Resource: "machineconfigpools"}
-	client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+		gvr: "MachineConfigPoolsList",
+	})
 	decUnstructured := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 
 	testMachineConfigPools := &unstructured.Unstructured{}

pkg/gather/clusterconfig/machine_sets_test.go

@@ -20,7 +20,9 @@ metadata:
     name: test-worker
 `
 	gvr := schema.GroupVersionResource{Group: "machine.openshift.io", Version: "v1beta1", Resource: "machinesets"}
-	client := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme())
+	client := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{
+		gvr: "MachineSetsList",
+	})
 	decUnstructured := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 
 	testMachineSet := &unstructured.Unstructured{}