Skip to content
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

chore: add testing.Short() to health check tests #1763

Merged
merged 2 commits into from
Apr 20, 2023
Merged

chore: add testing.Short() to health check tests #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e27990
chore: add testing.Short() to health check tests
enocom Apr 20, 2023
bc51294
Merge branch 'main' into unit-test-cleanup
jackwotherspoon Apr 20, 2023
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
60 changes: 30 additions & 30 deletions internal/proxy/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,63 +130,63 @@ func TestClientInitialization(t *testing.T) {
desc: "multiple instances",
in: &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: pg},
{Name: mysql},
{Name: sqlserver},
},
},
wantTCPAddrs: []string{"127.0.0.1:5000", "127.0.0.1:5001", "127.0.0.1:5002"},
wantTCPAddrs: []string{"127.0.0.1:50000", "127.0.0.1:50001", "127.0.0.1:50002"},
},
{
desc: "with instance address",
in: &proxy.Config{
Addr: "1.1.1.1", // bad address, binding shouldn't happen here.
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Addr: "0.0.0.0", Name: pg},
},
},
wantTCPAddrs: []string{"0.0.0.0:5000"},
wantTCPAddrs: []string{"0.0.0.0:50000"},
},
{
desc: "IPv6 support",
in: &proxy.Config{
Addr: "::1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: pg},
},
},
wantTCPAddrs: []string{"[::1]:5000"},
wantTCPAddrs: []string{"[::1]:50000"},
},
{
desc: "with instance port",
in: &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: pg, Port: 6000},
{Name: pg, Port: 60000},
},
},
wantTCPAddrs: []string{"127.0.0.1:6000"},
wantTCPAddrs: []string{"127.0.0.1:60000"},
},
{
desc: "with global port and instance port",
in: &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: pg},
{Name: mysql, Port: 6000},
{Name: mysql, Port: 60000},
{Name: sqlserver},
},
},
wantTCPAddrs: []string{
"127.0.0.1:5000",
"127.0.0.1:6000",
"127.0.0.1:5001",
"127.0.0.1:50000",
"127.0.0.1:60000",
"127.0.0.1:50001",
},
},
{
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestClientInitialization(t *testing.T) {
desc: "with a global TCP host port and an instance Unix socket",
in: &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: mysql, UnixSocket: testDir},
},
Expand All @@ -242,11 +242,11 @@ func TestClientInitialization(t *testing.T) {
Addr: "127.0.0.1",
UnixSocket: testDir,
Instances: []proxy.InstanceConnConfig{
{Name: pg, Port: 5000},
{Name: pg, Port: 50000},
},
},
wantTCPAddrs: []string{
"127.0.0.1:5000",
"127.0.0.1:50000",
},
},
{
Expand Down Expand Up @@ -350,7 +350,7 @@ func TestClientLimitsMaxConnections(t *testing.T) {
d := &fakeDialer{}
in := &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: "proj:region:pg"},
},
Expand All @@ -363,13 +363,13 @@ func TestClientLimitsMaxConnections(t *testing.T) {
defer c.Close()
go c.Serve(context.Background(), func() {})

conn1, err1 := net.Dial("tcp", "127.0.0.1:5000")
conn1, err1 := net.Dial("tcp", "127.0.0.1:50000")
if err1 != nil {
t.Fatalf("net.Dial error: %v", err1)
}
defer conn1.Close()

conn2, err2 := net.Dial("tcp", "127.0.0.1:5000")
conn2, err2 := net.Dial("tcp", "127.0.0.1:50000")
if err2 != nil {
t.Fatalf("net.Dial error: %v", err1)
}
Expand Down Expand Up @@ -422,7 +422,7 @@ func tryTCPDial(t *testing.T, addr string) net.Conn {
func TestClientCloseWaitsForActiveConnections(t *testing.T) {
in := &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: "proj:region:pg"},
},
Expand All @@ -434,7 +434,7 @@ func TestClientCloseWaitsForActiveConnections(t *testing.T) {
}
go c.Serve(context.Background(), func() {})

conn := tryTCPDial(t, "127.0.0.1:5000")
conn := tryTCPDial(t, "127.0.0.1:50000")
defer conn.Close()

if err := c.Close(); err == nil {
Expand All @@ -445,7 +445,7 @@ func TestClientCloseWaitsForActiveConnections(t *testing.T) {
func TestClientClosesCleanly(t *testing.T) {
in := &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: "proj:reg:inst"},
},
Expand All @@ -456,7 +456,7 @@ func TestClientClosesCleanly(t *testing.T) {
}
go c.Serve(context.Background(), func() {})

conn := tryTCPDial(t, "127.0.0.1:5000")
conn := tryTCPDial(t, "127.0.0.1:50000")
_ = conn.Close()

if err := c.Close(); err != nil {
Expand All @@ -467,7 +467,7 @@ func TestClientClosesCleanly(t *testing.T) {
func TestClosesWithError(t *testing.T) {
in := &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: "proj:reg:inst"},
},
Expand All @@ -478,7 +478,7 @@ func TestClosesWithError(t *testing.T) {
}
go c.Serve(context.Background(), func() {})

conn := tryTCPDial(t, "127.0.0.1:5000")
conn := tryTCPDial(t, "127.0.0.1:50000")
defer conn.Close()

if err = c.Close(); err == nil {
Expand Down Expand Up @@ -574,7 +574,7 @@ func TestClientNotifiesCallerOnServe(t *testing.T) {
func TestClientConnCount(t *testing.T) {
in := &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: "proj:region:pg"},
},
Expand All @@ -596,7 +596,7 @@ func TestClientConnCount(t *testing.T) {
t.Fatalf("want 10 max connections, got = %v", gotMax)
}

conn := tryTCPDial(t, "127.0.0.1:5000")
conn := tryTCPDial(t, "127.0.0.1:50000")
defer conn.Close()

verifyOpen := func(t *testing.T, want uint64) {
Expand All @@ -616,7 +616,7 @@ func TestClientConnCount(t *testing.T) {
func TestCheckConnections(t *testing.T) {
in := &proxy.Config{
Addr: "127.0.0.1",
Port: 5000,
Port: 50000,
Instances: []proxy.InstanceConnConfig{
{Name: "proj:region:pg"},
},
Expand All @@ -643,7 +643,7 @@ func TestCheckConnections(t *testing.T) {

in = &proxy.Config{
Addr: "127.0.0.1",
Port: 6000,
Port: 60000,
Instances: []proxy.InstanceConnConfig{
{Name: "proj:region:pg1"},
{Name: "proj:region:pg2"},
Expand Down
1 change: 1 addition & 0 deletions tests/connection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ func proxyConnTest(t *testing.T, args []string, driver, dsn string) {
// testHealthCheck verifies that when a proxy client serves the given instance,
// the readiness endpoint serves http.StatusOK.
func testHealthCheck(t *testing.T, connName string) {
t.Helper()
ctx, cancel := context.WithTimeout(context.Background(), connTestTimeout)
defer cancel()

Expand Down
3 changes: 3 additions & 0 deletions tests/mysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,5 +183,8 @@ func TestMySQLGcloudAuth(t *testing.T) {
}

func TestMySQLHealthCheck(t *testing.T) {
if testing.Short() {
t.Skip("skipping MySQL integration tests")
}
testHealthCheck(t, *mysqlConnName)
}
3 changes: 3 additions & 0 deletions tests/postgres_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,8 @@ func TestPostgresIAMDBAuthn(t *testing.T) {
}

func TestPostgresHealthCheck(t *testing.T) {
if testing.Short() {
t.Skip("skipping Postgres integration tests")
}
testHealthCheck(t, *postgresConnName)
}
3 changes: 3 additions & 0 deletions tests/sqlserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,8 @@ func TestSQLServerGcloudAuth(t *testing.T) {
}

func TestSQLServerHealthCheck(t *testing.T) {
if testing.Short() {
t.Skip("skipping SQL Server integration tests")
}
testHealthCheck(t, *sqlserverConnName)
}