From 00144659ec448f6cbee213cd98a41f097a9d663c Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 22 Jan 2016 13:54:56 -0800 Subject: [PATCH] fix nil pointer in addons test --- test/e2e/addon_update.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/test/e2e/addon_update.go b/test/e2e/addon_update.go index f85cee60a05..a30f8128acf 100644 --- a/test/e2e/addon_update.go +++ b/test/e2e/addon_update.go @@ -399,16 +399,17 @@ func writeRemoteFile(sshClient *ssh.Client, data, dir, fileName string, mode os. defer session.Close() fileSize := len(data) - go func() { - // ignore errors here. scp whould return errors if something goes wrong. - pipe, _ := session.StdinPipe() - defer pipe.Close() - fmt.Fprintf(pipe, "C%#o %d %s\n", mode, fileSize, fileName) - io.Copy(pipe, strings.NewReader(data)) - fmt.Fprint(pipe, "\x00") - }() - if err := session.Run(fmt.Sprintf("scp -t %s", dir)); err != nil { + pipe, err := session.StdinPipe() + if err != nil { return err } - return nil + defer pipe.Close() + if err := session.Start(fmt.Sprintf("scp -t %s", dir)); err != nil { + return err + } + fmt.Fprintf(pipe, "C%#o %d %s\n", mode, fileSize, fileName) + io.Copy(pipe, strings.NewReader(data)) + fmt.Fprint(pipe, "\x00") + pipe.Close() + return session.Wait() }