Merge pull request #186 from facebookincubator/fix_teststeps_leaks

rihter007 · web-flow · commit cbdd134e62be · 2020-11-30T22:04:28.000Z
Minor fix for sshcmd and terminalexpect plugins
diff --git a/plugins/teststeps/sshcmd/sshcmd.go b/plugins/teststeps/sshcmd/sshcmd.go
@@ -195,7 +195,7 @@ func (ts *SSHCmd) Run(cancel, pause <-chan struct{}, ch test.TestStepChannels, p
 		session.Stdout, session.Stderr = &stdout, &stderr
 		cmd := shellquote.Join(append([]string{executable}, args...)...)
 		log.Printf("Running remote SSH command on %s: '%v'", addr, cmd)
-		errCh := make(chan error)
+		errCh := make(chan error, 1)
 		go func() {
 			innerErr := session.Run(cmd)
 			errCh <- innerErr
diff --git a/plugins/teststeps/terminalexpect/terminalexpect.go b/plugins/teststeps/terminalexpect/terminalexpect.go
@@ -70,6 +70,9 @@ func (ts *TerminalExpect) Run(cancel, pause <-chan struct{}, ch test.TestStepCha
 		errCh := make(chan error)
 		go func() {
 			errCh <- hook.Run()
+			if closeErr := hook.Close(); closeErr != nil {
+				log.Errorf("Failed to close hook, err: %v", closeErr)
+			}
 		}()
 		select {
 		case err := <-errCh:
