Skip to content

Fix flaky tests #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nothub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix flaky tests #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 32 additions & 14 deletions goph_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,13 @@ func TestGoph(t *testing.T) {

func gophAuthTest(t *testing.T) {

newServer("2020")
cleanup, err := newServer("2020")
if err != nil {
t.Fatalf("failed to start server: %s", err)
}
defer cleanup()

_, err := goph.NewConn(&goph.Config{
_, err = goph.NewConn(&goph.Config{
Addr: "127.0.10.10",
Port: 2020,
User: "melbahja",
Expand All @@ -77,8 +81,11 @@ func gophAuthTest(t *testing.T) {
}

func gophRunTest(t *testing.T) {

newServer("2021")
cleanup, err := newServer("2021")
if err != nil {
t.Fatalf("failed to start server: %s", err)
}
defer cleanup()

client, err := goph.NewConn(&goph.Config{
Addr: "127.0.10.10",
Expand All @@ -100,10 +107,13 @@ func gophRunTest(t *testing.T) {
}

func gophWrongPassTest(t *testing.T) {
cleanup, err := newServer("2022")
if err != nil {
t.Fatalf("failed to start server: %s", err)
}
defer cleanup()

newServer("2022")

_, err := goph.NewConn(&goph.Config{
_, err = goph.NewConn(&goph.Config{
Addr: "127.0.10.10",
Port: 2022,
User: "melbahja",
Expand All @@ -116,8 +126,7 @@ func gophWrongPassTest(t *testing.T) {
}
}

func newServer(port string) {

func newServer(port string) (func(), error) {
config := &ssh.ServerConfig{
// Remove to disable password auth.
PasswordCallback: func(c ssh.ConnMetadata, pass []byte) (*ssh.Permissions, error) {
Expand All @@ -131,7 +140,7 @@ func newServer(port string) {

private, err := ssh.ParsePrivateKey(privateBytes)
if err != nil {
log.Fatal("Failed to parse private key: ", err)
return nil, fmt.Errorf("failed to parse private key", err)
}

config.AddHostKey(private)
Expand All @@ -140,21 +149,27 @@ func newServer(port string) {
// accepted.
listener, err := net.Listen("tcp", "127.0.10.10:"+port)
if err != nil {
log.Fatal("failed to listen for connection: ", err)
return nil, fmt.Errorf("failed to listen for connection: %w", err)
}

cleanup := func() {
listener.Close()
}

go func() {

nConn, err := listener.Accept()
if err != nil {
log.Fatal("failed to accept incoming connection: ", err)
log.Printf("failed to accept incoming connection: %s", err)
return
}

// Before use, a handshake must be performed on the incoming
// net.Conn.
_, chans, reqs, err := ssh.NewServerConn(nConn, config)
if err != nil {
log.Fatal("failed to handshake: ", err)
log.Printf("failed to handshake: %s", err)
return
}

// The incoming Request channel must be serviced.
Expand All @@ -169,7 +184,8 @@ func newServer(port string) {

channel, requests, err := newChannel.Accept()
if err != nil {
log.Fatalf("Could not accept channel: %v", err)
log.Printf("Could not accept channel: %s", err)
continue
}

go func(in <-chan *ssh.Request) {
Expand Down Expand Up @@ -197,4 +213,6 @@ func newServer(port string) {
}()
}
}()

return cleanup, nil
}