Skip to content

fix: use dynamic ports in sgcp tests to avoid port 1215 conflict #1100

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

Merged
cvaroqui merged 1 commit into from
Aug 31, 2026
Merged

fix: use dynamic ports in sgcp tests to avoid port 1215 conflict #1100

Show file tree
Hide file tree
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
17 changes: 4 additions & 13 deletions util/sgcp/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package sgcp
import (
"context"
"encoding/json"
"net"
"net/http"
"net/http/httptest"
"strings"
Expand Down Expand Up @@ -49,16 +48,7 @@ func TestDo(t *testing.T) {
}
})

ts := httptest.NewUnstartedServer(handler)

ln, err := net.Listen("tcp", "127.0.0.1:1215")
if err != nil {
t.Fatal(err)
}

ts.EnableHTTP2 = true
ts.Listener = ln
ts.StartTLS()
ts := httptest.NewTLSServer(handler)
defer ts.Close()

client := ts.Client()
Expand All @@ -73,11 +63,12 @@ func TestDo(t *testing.T) {
ctx := context.Background()

// First request should hit the server
code, data1, err := api.do(ctx, "GET", "https://127.0.0.1:1215/foo/bar", nil, "scope1", "scope2")
url := ts.URL + "/foo/bar"
code, data1, err := api.do(ctx, "GET", url, nil, "scope1", "scope2")
require.Equal(t, 200, code)
require.NoError(t, err)
t.Logf("First request result: %s", string(data1))
assert.Equal(t, string([]byte(`{"test":["test"]}`)), strings.TrimSuffix(string(data1), "\n"))
assert.Equal(t, `{"test":["test"]}`, strings.TrimSuffix(string(data1), "\n"))
}

// TestCheckStatusCode tests the status code checking
Expand Down
16 changes: 5 additions & 11 deletions util/sgcp/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"encoding/base64"
"encoding/json"
"net"
"net/http"
"net/http/httptest"
"strings"
Expand All @@ -18,6 +17,8 @@ import (
func TestTokenFactory(t *testing.T) {
defer Setup(t)()

t.Setenv("OSVC_VAR_DIR", t.TempDir())

cfg := GetConfig()
require.NotNil(t, cfg)

Expand Down Expand Up @@ -59,18 +60,11 @@ func TestTokenFactory(t *testing.T) {
w.WriteHeader(http.StatusNotFound)
})

ts := httptest.NewUnstartedServer(handler)

ln, err := net.Listen("tcp", "127.0.0.1:1215")
if err != nil {
t.Fatal(err)
}

ts.EnableHTTP2 = true
ts.Listener = ln
ts.StartTLS()
ts := httptest.NewTLSServer(handler)
defer ts.Close()

cfg.Auth.BaseURL = ts.URL + "/auth"

authInfo := &AuthInfo{
AccountID: "account1",
ClientID: "clientid1",
Expand Down
14 changes: 3 additions & 11 deletions util/sgcp/file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package sgcp
import (
"context"
"encoding/json"
"net"
"net/http"
"net/http/httptest"
"testing"
Expand Down Expand Up @@ -66,18 +65,11 @@ func TestGetFilesystem(t *testing.T) {
w.WriteHeader(http.StatusNotFound)
})

ts := httptest.NewUnstartedServer(handler)

ln, err := net.Listen("tcp", "127.0.0.1:1215")
if err != nil {
t.Fatal(err)
}

ts.EnableHTTP2 = true
ts.Listener = ln
ts.StartTLS()
ts := httptest.NewTLSServer(handler)
defer ts.Close()

cfg.Files.BaseURL = ts.URL + "/file"

client := ts.Client()
log := plog.NewDefaultLogger()
tk := &TTkBuilder{}
Expand Down