Skip to content

Commit

Permalink
Merge pull request #14050 from ncdc/test-fix-registry-disk-usage-dump
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed May 6, 2017
2 parents a27eb63 + 0112eb2 commit c49244c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion test/extended/util/framework.go
Expand Up @@ -220,7 +220,7 @@ func ExaminePodDiskUsage(oc *CLI) {
var podName string
if err == nil {
b := []byte(out)
var list kapi.PodList
var list kapiv1.PodList
err = json.Unmarshal(b, &list)
if err == nil {
for _, pod := range list.Items {
Expand All @@ -236,6 +236,10 @@ func ExaminePodDiskUsage(oc *CLI) {
} else {
fmt.Fprintf(g.GinkgoWriter, "\n\n got error on get pods: %v\n\n", err)
}
if len(podName) == 0 {
fmt.Fprintf(g.GinkgoWriter, "Unable to determine registry pod name, so we can't examine its disk usage.")
return
}

out, err = oc.Run("exec").Args("-n", "default", podName, "df", "--config", KubeConfigPath()).Output()
if err == nil {
Expand Down

0 comments on commit c49244c

Please sign in to comment.