go.crypto/ssh: make tests work on non-cgo platforms.

user.Current() currently requires cgo - if an error is returned
attempt to get the username from the environment.

R=golang-dev, minux.ma, bradfitz, dave
CC=golang-dev
https://golang.org/cl/6819113

1 files changed, 16 insertions, 5 deletions

diff --git a/ssh/test/test_unix_test.go b/ssh/test/test_unix_test.go
index ad10408..47a03d0 100644
--- a/ssh/test/test_unix_test.go
+++ b/ssh/test/test_unix_test.go
@@ -150,15 +150,26 @@ type server struct {
 	output     bytes.Buffer // holds stderr from sshd process
 }
 
-func clientConfig() *ssh.ClientConfig {
-	user, err := user.Current()
-	if err != nil {
-		panic(err)
+func username() string {
+	var username string
+	if user, err := user.Current(); err == nil {
+		username = user.Username
+	} else {
+		// user.Current() currently requires cgo. If an error is
+		// returned attempt to get the username from the environment.
+		username = os.Getenv("USER")
+	}
+	if username == "" {
+		panic("Unable to get username")
 	}
+	return username
+}
+
+func clientConfig() *ssh.ClientConfig {
 	kc := new(keychain)
 	kc.keys = append(kc.keys, rsakey)
 	config := &ssh.ClientConfig{
-		User: user.Username,
+		User: username(),
 		Auth: []ssh.ClientAuth{
 			ssh.ClientAuthKeyring(kc),
 		},