Skip to content

Commit

Permalink
Use port 30000 to test port availability so it does not interfere wit…
Browse files Browse the repository at this point in the history
…h running pgweb instance
  • Loading branch information
sosedoff committed Jan 20, 2017
1 parent 1f7367e commit 33f3e20
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions pkg/connection/port_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ func Test_portAvailable(t *testing.T) {
t.Skip("FIXME")
}

assert.Equal(t, true, portAvailable(8081))
assert.Equal(t, true, portAvailable(30000))

serv, err := net.Listen("tcp", "127.0.0.1:8081")
serv, err := net.Listen("tcp", "127.0.0.1:30000")
if err != nil {
fmt.Fprintln(os.Stderr, "Unable to start test tcp listener:", err)
t.Fail()
Expand All @@ -35,20 +35,20 @@ func Test_portAvailable(t *testing.T) {
}
}()

assert.Equal(t, false, portAvailable(8081))
assert.Equal(t, true, portAvailable(8082))
assert.Equal(t, false, portAvailable(30000))
assert.Equal(t, true, portAvailable(30001))
}

func Test_getAvailablePort(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("FIXME")
}

port, err := AvailablePort(8081, 1)
port, err := AvailablePort(30000, 1)
assert.Equal(t, nil, err)
assert.Equal(t, 8081, port)
assert.Equal(t, 30000, port)

serv, err := net.Listen("tcp", "127.0.0.1:8081")
serv, err := net.Listen("tcp", "127.0.0.1:30000")
if err != nil {
fmt.Fprintln(os.Stderr, "Unable to start test tcp listener:", err)
t.Fail()
Expand All @@ -65,11 +65,11 @@ func Test_getAvailablePort(t *testing.T) {
}
}()

port, err = AvailablePort(8081, 0)
port, err = AvailablePort(30000, 0)
assert.EqualError(t, err, "No available port")
assert.Equal(t, -1, port)

port, err = AvailablePort(8081, 1)
port, err = AvailablePort(30000, 1)
assert.Equal(t, nil, err)
assert.Equal(t, 8082, port)
assert.Equal(t, 30001, port)
}

0 comments on commit 33f3e20

Please sign in to comment.