iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

communicator/ssh: Simplify tests

This commit is contained in:
Mitchell Hashimoto 2013-05-20 15:49:14 -07:00
parent 08ac912cb7
commit 6d3e7e9964
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
communicator/ssh/communicator_test.go
View File

@ -58,31 +58,6 @@ func init() {
} }
} }
func newMockAuthServer(t *testing.T) string {
l, err := ssh.Listen("tcp", "127.0.0.1:0", serverConfig)
if err != nil {
t.Fatalf("unable to newMockAuthServer: %s", err)
}
go func() {
defer l.Close()
c, err := l.Accept()
if err != nil {
t.Errorf("Unable to accept incoming connection: %v", err)
return
}
if err := c.Handshake(); err != nil {
// not Errorf because this is expected to
// fail for some tests.
t.Logf("Handshaking error: %v", err)
return
}
defer c.Close()
}()
return l.Addr().String()
}
func newMockLineServer(t *testing.T) string { func newMockLineServer(t *testing.T) string {
l, err := ssh.Listen("tcp", "127.0.0.1:0", serverConfig) l, err := ssh.Listen("tcp", "127.0.0.1:0", serverConfig)
if err != nil { if err != nil {
@ -165,7 +140,7 @@ func TestNew_Invalid(t *testing.T) {
}, },
} }
conn, err := net.Dial("tcp", newMockAuthServer(t)) conn, err := net.Dial("tcp", newMockLineServer(t))
if err != nil { if err != nil {
t.Fatalf("unable to dial to remote side: %s", err) t.Fatalf("unable to dial to remote side: %s", err)
} }