Skip to content

Commit

Permalink
changes per comments
Browse files Browse the repository at this point in the history
  • Loading branch information
JessicaGreben committed Feb 8, 2019
1 parent e44fa9c commit f058d43
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 22 deletions.
18 changes: 2 additions & 16 deletions pkg/dashboard/dashboard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions pkg/kube/clientset.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion test/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,4 @@ func SetupAddDeploys(k *kube.API, namespace string) *kube.API {
fmt.Println(err)
}
return k

}

0 comments on commit f058d43

Please sign in to comment.