Merge pull request #10915 from juanvallejo/jvallejo_return-err-on-oc-get-empty-list

OpenShift Bot · web-flow · commit 770ba8b0bc34 · 2016-11-01T16:34:19.000-04:00
Merged by openshift-bot
diff --git a/test/cmd/sdn.sh b/test/cmd/sdn.sh
@@ -49,7 +49,7 @@ os::test::junit::declare_suite_end
 
 os::test::junit::declare_suite_start "cmd/sdn/hostsubnets"
 # test-cmd environment has no nodes, hence no hostsubnets
-os::cmd::expect_success_and_not_text 'oc get hostsubnets' '.'
+os::cmd::expect_success_and_text 'oc get hostsubnets' 'No resources found.'
 os::test::junit::declare_suite_end
 
 os::test::junit::declare_suite_start "cmd/sdn/egressnetworkpolicies"
diff --git a/test/extended/builds/remove_buildconfig.go b/test/extended/builds/remove_buildconfig.go
@@ -47,7 +47,7 @@ var _ = g.Describe("[builds][Conformance] remove all builds when build configura
 			err = wait.Poll(3*time.Second, 3*time.Minute, func() (bool, error) {
 				out, err := oc.Run("get").Args("-o", "name", "builds").Output()
 				o.Expect(err).NotTo(o.HaveOccurred())
-				if len(out) == 0 {
+				if out == "No resources found." {
 					return true, nil
 				}
 				return false, nil
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get.go

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ var _ = g.Describe("[builds][Conformance] remove all builds when build configura`
`47`	`47`	`err = wait.Poll(3time.Second, 3time.Minute, func() (bool, error) {`
`48`	`48`	`out, err := oc.Run("get").Args("-o", "name", "builds").Output()`
`49`	`49`	`o.Expect(err).NotTo(o.HaveOccurred())`
`50`		`- if len(out) == 0 {`
	`50`	`+ if out == "No resources found." {`
`51`	`51`	`return true, nil`
`52`	`52`	`}`
`53`	`53`	`return false, nil`