github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

fix nil pointer in addons test

Browse Source
This commit is contained in:
Mike Danese 2016-01-22 13:54:56 -08:00
parent 3a15a374ba
commit 00144659ec
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/addon_update.go
View File

@ -399,16 +399,17 @@ func writeRemoteFile(sshClient *ssh.Client, data, dir, fileName string, mode os.
defer session.Close() defer session.Close()
fileSize := len(data) fileSize := len(data)
go func() { pipe, err := session.StdinPipe()
// ignore errors here. scp whould return errors if something goes wrong. if err != nil {
pipe, _ := session.StdinPipe() return err
}
defer pipe.Close() 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) fmt.Fprintf(pipe, "C%#o %d %s\n", mode, fileSize, fileName)
io.Copy(pipe, strings.NewReader(data)) io.Copy(pipe, strings.NewReader(data))
fmt.Fprint(pipe, "\x00") fmt.Fprint(pipe, "\x00")
}() pipe.Close()
if err := session.Run(fmt.Sprintf("scp -t %s", dir)); err != nil { return session.Wait()
return err
}
return nil
} }