scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16473 from mesosphere/sttts-fix-panics-in-runKubectlWithTimeout

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-29 10:53:19 -07:00
parent 848fed8f4b e755988d59
commit c691f66b79
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/portforward.go
View File

@@ -115,6 +115,7 @@ func runPortForward(ns, podName string, port int) (*exec.Cmd, int) {
func runKubectlWithTimeout(timeout time.Duration, args ...string) string { func runKubectlWithTimeout(timeout time.Duration, args ...string) string {
logOutput := make(chan string) logOutput := make(chan string)
go func() { go func() {
defer GinkgoRecover()
logOutput <- runKubectl(args...) logOutput <- runKubectl(args...)
}() }()
select { select {