clients: skip ssh test when SSH_AUTH_SOCK is not present

Author: mcuadros

clients/ssh/auth_method_test.go

@@ -13,79 +13,79 @@ type SuiteCommon struct{}
 
 var _ = Suite(&SuiteCommon{})
 
-func (s *SuiteRemote) TestKeyboardInteractiveName(c *C) {
+func (s *SuiteCommon) TestKeyboardInteractiveName(c *C) {
 	a := &KeyboardInteractive{
 		User:      "test",
 		Challenge: nil,
 	}
 	c.Assert(a.Name(), Equals, KeyboardInteractiveName)
 }
 
-func (s *SuiteRemote) TestKeyboardInteractiveString(c *C) {
+func (s *SuiteCommon) TestKeyboardInteractiveString(c *C) {
 	a := &KeyboardInteractive{
 		User:      "test",
 		Challenge: nil,
 	}
 	c.Assert(a.String(), Equals, fmt.Sprintf("user: test, name: %s", KeyboardInteractiveName))
 }
 
-func (s *SuiteRemote) TestPasswordName(c *C) {
+func (s *SuiteCommon) TestPasswordName(c *C) {
 	a := &Password{
 		User: "test",
 		Pass: "",
 	}
 	c.Assert(a.Name(), Equals, PasswordName)
 }
 
-func (s *SuiteRemote) TestPasswordString(c *C) {
+func (s *SuiteCommon) TestPasswordString(c *C) {
 	a := &Password{
 		User: "test",
 		Pass: "",
 	}
 	c.Assert(a.String(), Equals, fmt.Sprintf("user: test, name: %s", PasswordName))
 }
 
-func (s *SuiteRemote) TestPasswordCallbackName(c *C) {
+func (s *SuiteCommon) TestPasswordCallbackName(c *C) {
 	a := &PasswordCallback{
 		User:     "test",
 		Callback: nil,
 	}
 	c.Assert(a.Name(), Equals, PasswordCallbackName)
 }
 
-func (s *SuiteRemote) TestPasswordCallbackString(c *C) {
+func (s *SuiteCommon) TestPasswordCallbackString(c *C) {
 	a := &PasswordCallback{
 		User:     "test",
 		Callback: nil,
 	}
 	c.Assert(a.String(), Equals, fmt.Sprintf("user: test, name: %s", PasswordCallbackName))
 }
 
-func (s *SuiteRemote) TestPublicKeysName(c *C) {
+func (s *SuiteCommon) TestPublicKeysName(c *C) {
 	a := &PublicKeys{
 		User:   "test",
 		Signer: nil,
 	}
 	c.Assert(a.Name(), Equals, PublicKeysName)
 }
 
-func (s *SuiteRemote) TestPublicKeysString(c *C) {
+func (s *SuiteCommon) TestPublicKeysString(c *C) {
 	a := &PublicKeys{
 		User:   "test",
 		Signer: nil,
 	}
 	c.Assert(a.String(), Equals, fmt.Sprintf("user: test, name: %s", PublicKeysName))
 }
 
-func (s *SuiteRemote) TestPublicKeysCallbackName(c *C) {
+func (s *SuiteCommon) TestPublicKeysCallbackName(c *C) {
 	a := &PublicKeysCallback{
 		User:     "test",
 		Callback: nil,
 	}
 	c.Assert(a.Name(), Equals, PublicKeysCallbackName)
 }
 
-func (s *SuiteRemote) TestPublicKeysCallbackString(c *C) {
+func (s *SuiteCommon) TestPublicKeysCallbackString(c *C) {
 	a := &PublicKeysCallback{
 		User:     "test",
 		Callback: nil,

clients/ssh/git_upload_pack_test.go

@@ -57,6 +57,12 @@ func (c *sshAgentConn) close() error {
 	return c.pipe.Close()
 }
 
+func (s *SuiteRemote) SetUpSuite(c *C) {
+	if os.Getenv("SSH_AUTH_SOCK") == "" {
+		c.Skip("SSH_AUTH_SOCK is not set")
+	}
+}
+
 func (s *SuiteRemote) TestConnectWithPublicKeysCallback(c *C) {
 	agent, err := newSSHAgentConn()
 	c.Assert(err, IsNil)