Don't timeout on commands we need to finish

[#149731737]

Signed-off-by: Tiago Scolari <[email protected]>

.gitignore

@@ -1 +1,9 @@
 cmd/guardian/guardian
+cmd/init/init
+rundmc/nstar/nstar
+
+*.o
+
+gqt/--action
+gqt/down
+gqt/up

gqt/create_test.go

@@ -1,7 +1,6 @@
 package gqt_test
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -646,19 +645,13 @@ func runInContainer(container garden.Container, path string, args []string) {
 }
 
 func numOpenSockets(pid int) (num int) {
-	sess, err := gexec.Start(exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d | grep sock", pid)), GinkgoWriter, GinkgoWriter)
-	Expect(err).NotTo(HaveOccurred())
-	Eventually(sess).Should(gexec.Exit(0))
-
-	return bytes.Count(sess.Out.Contents(), []byte{'\n'})
+	stdout := runCommand(exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d | grep sock", pid)))
+	return strings.Count(stdout, "\n")
 }
 
 func numPipes(pid int) (num int) {
-	sess, err := gexec.Start(exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d | grep pipe", pid)), GinkgoWriter, GinkgoWriter)
-	Expect(err).NotTo(HaveOccurred())
-	Eventually(sess).Should(gexec.Exit(0))
-
-	return bytes.Count(sess.Out.Contents(), []byte{'\n'})
+	stdout := runCommand(exec.Command("sh", "-c", fmt.Sprintf("lsof -p %d | grep pipe", pid)))
+	return strings.Count(stdout, "\n")
 }
 
 func findCgroupPath(pid int, cgroupToFind string) string {

gqt/gqt_suite_test.go

@@ -138,15 +138,17 @@ func initGrootStore(grootBin, storePath string, idMappings []string) {
 	Expect(initStore.Run()).To(Succeed())
 }
 
-func runCommandInDir(cmd *exec.Cmd, workingDir string) {
+func runCommandInDir(cmd *exec.Cmd, workingDir string) string {
+	var stdout bytes.Buffer
 	cmd.Dir = workingDir
-	cmd.Stdout = GinkgoWriter
+	cmd.Stdout = io.MultiWriter(&stdout, GinkgoWriter)
 	cmd.Stderr = GinkgoWriter
 	Expect(cmd.Run()).To(Succeed())
+	return stdout.String()
 }
 
-func runCommand(cmd *exec.Cmd) {
-	runCommandInDir(cmd, "")
+func runCommand(cmd *exec.Cmd) string {
+	return runCommandInDir(cmd, "")
 }
 
 func defaultConfig() runner.GdnRunnerConfig {