Skip to content

Commit a9d337e

Browse files
Code review comments.
Signed-off-by: naveensrinivasan <[email protected]>
1 parent 30bd512 commit a9d337e

File tree

1 file changed

+39
-26
lines changed

1 file changed

+39
-26
lines changed

clients/githubrepo/roundtripper/tokens/accessor_test.go

+39-26
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,11 @@ func TestMakeTokenAccessor(t *testing.T) {
4646
t.Run(tt.name, func(t *testing.T) {
4747
switch {
4848
case tt.useGitHubToken:
49-
token := "test"
50-
t.Setenv("GITHUB_TOKEN", token)
51-
got := MakeTokenAccessor()
52-
if got == nil {
53-
t.Errorf("MakeTokenAccessor() = nil, want not nil")
54-
}
55-
raccess, ok := got.(*roundRobinAccessor)
56-
if !ok {
57-
t.Errorf("MakeTokenAccessor() = %v, want *roundRobinAccessor", got)
58-
}
59-
if raccess.accessTokens[0] != token {
60-
t.Errorf("accessTokens[0] = %v, want %v", raccess.accessTokens[0], token)
61-
}
49+
t.Helper()
50+
testToken(t)
6251
case tt.useServer:
63-
t.Setenv("GITHUB_AUTH_SERVER", "localhost:8080")
64-
server := startTestServer()
65-
defer serverShutdown(server)
66-
myRPCService := &MyRPCService{}
67-
rpc.Register(myRPCService) //nolint:errcheck
68-
server.Handler = nil
69-
rpc.HandleHTTP()
70-
got := MakeTokenAccessor()
71-
if got == nil {
72-
t.Errorf("MakeTokenAccessor() = nil, want not nil")
73-
}
52+
t.Helper()
53+
testServer(t)
7454
default:
7555
got := MakeTokenAccessor()
7656
if got != nil {
@@ -81,15 +61,48 @@ func TestMakeTokenAccessor(t *testing.T) {
8161
}
8262
}
8363

64+
func testToken(t *testing.T) {
65+
t.Setenv("GITHUB_TOKEN", "")
66+
token := "test"
67+
t.Setenv("GITHUB_TOKEN", token)
68+
got := MakeTokenAccessor()
69+
if got == nil {
70+
t.Errorf("MakeTokenAccessor() = nil, want not nil")
71+
}
72+
raccess, ok := got.(*roundRobinAccessor)
73+
if !ok {
74+
t.Errorf("MakeTokenAccessor() = %v, want *roundRobinAccessor", got)
75+
}
76+
if raccess.accessTokens[0] != token {
77+
t.Errorf("accessTokens[0] = %v, want %v", raccess.accessTokens[0], token)
78+
}
79+
}
80+
81+
func testServer(t *testing.T) {
82+
t.Setenv("GITHUB_AUTH_SERVER", "localhost:8080")
83+
server := startTestServer()
84+
t.Cleanup(func() {
85+
serverShutdown(server)
86+
})
87+
myRPCService := &MyRPCService{}
88+
rpc.Register(myRPCService) //nolint:errcheck
89+
server.Handler = nil
90+
rpc.HandleHTTP()
91+
got := MakeTokenAccessor()
92+
if got == nil {
93+
t.Errorf("MakeTokenAccessor() = nil, want not nil")
94+
}
95+
}
96+
8497
type MyRPCService struct {
8598
// Define your RPC service methods here
8699
}
87100

88101
func startTestServer() *http.Server {
89102
// Create a new server
90103
server := &http.Server{ //nolint:gosec
91-
Addr: ":8080", // Use any available port
92-
Handler: nil, // Use the default handler
104+
Addr: ":8080",
105+
Handler: nil, // Use the default handler
93106
}
94107

95108
// Start the server in a separate goroutine

0 commit comments

Comments
 (0)