diff --git a/pkg/dashboard/dashboard_test.go b/pkg/dashboard/dashboard_test.go index 1932b1731..bbcadb226 100644 --- a/pkg/dashboard/dashboard_test.go +++ b/pkg/dashboard/dashboard_test.go @@ -21,29 +21,15 @@ func TestGetTemplateData(t *testing.T) { }, } - sum := validator.ResultSummary{ + sum := &validator.ResultSummary{ Successes: uint(4), Warnings: uint(0), Failures: uint(1), } - res := validator.ResourceResult{} - - n := validator.NamespacedResult{ - Summary: &sum, - Results: []validator.ResourceResult{res}, - } - - expectedTmplData := TemplateData{ - ClusterSummary: &sum, - NamespacedResults: validator.NamespacedResults{ - "test": &n, - }, - } actualTmplData, _ := getTemplateData(c, k8s) - assert.Equal(t, actualTmplData.ClusterSummary.Failures, expectedTmplData.ClusterSummary.Failures, "should be equal") - assert.Equal(t, actualTmplData.ClusterSummary.Successes, expectedTmplData.ClusterSummary.Successes, "should be equal") + assert.EqualValues(t, actualTmplData.ClusterSummary, sum) assert.Equal(t, len(actualTmplData.NamespacedResults["test"].Results), 1, "should be equal") assert.Equal(t, len(actualTmplData.NamespacedResults["test"].Results[0].ContainerResults[0].Messages), 5, "should be equal") } diff --git a/pkg/kube/clientset.go b/pkg/kube/clientset.go index 1b83a0b8d..1189a1d46 100644 --- a/pkg/kube/clientset.go +++ b/pkg/kube/clientset.go @@ -15,11 +15,7 @@ type API struct { // GetDeploys gets all the deployments in the k8s cluster. func (api *API) GetDeploys() (*appsv1.DeploymentList, error) { - deploys, err := api.Clientset.AppsV1().Deployments("").List(metav1.ListOptions{}) - if err != nil { - return nil, err - } - return deploys, nil + return api.Clientset.AppsV1().Deployments("").List(metav1.ListOptions{}) } // CreateKubeAPI returns a new KubeAPI object to interact with the cluster API with. diff --git a/test/fixtures.go b/test/fixtures.go index 9dd5384c4..d1bbf8b1a 100644 --- a/test/fixtures.go +++ b/test/fixtures.go @@ -52,5 +52,4 @@ func SetupAddDeploys(k *kube.API, namespace string) *kube.API { fmt.Println(err) } return k - }