+
Skip to content

Update unit tests to support Go 1.22 http.ServerMux changes #3412

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

Closed
wants to merge 1 commit into from
Closed

Update unit tests to support Go 1.22 http.ServerMux changes #3412

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
10 changes: 5 additions & 5 deletions github/repos_contents_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,12 +472,12 @@ func TestRepositoriesService_GetContents_DirectoryWithSpaces(t *testing.T) {
t.Parallel()
client, mux, _ := setup(t)

mux.HandleFunc("/repos/o/r/contents/some directory/file.go", func(w http.ResponseWriter, r *http.Request) {
mux.HandleFunc("/repos/o/r/contents/some%2520directory/file.go", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
fmt.Fprint(w, `{}`)
})
ctx := context.Background()
_, _, _, err := client.Repositories.GetContents(ctx, "o", "r", "some directory/file.go", &RepositoryContentGetOptions{})
_, _, _, err := client.Repositories.GetContents(ctx, "o", "r", "some%2520directory/file.go", &RepositoryContentGetOptions{})
if err != nil {
t.Fatalf("Repositories.GetContents returned error: %v", err)
}
Expand All @@ -497,17 +497,17 @@ func TestRepositoriesService_GetContents_PathWithParent(t *testing.T) {
t.Fatal("Repositories.GetContents expected error but got none")
}
}

func TestRepositoriesService_GetContents_DirectoryWithPlusChars(t *testing.T) {
t.Parallel()
client, mux, _ := setup(t)

mux.HandleFunc("/repos/o/r/contents/some directory+name/file.go", func(w http.ResponseWriter, r *http.Request) {
mux.HandleFunc("/repos/o/r/contents/some%2520directory+name/file.go", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
fmt.Fprint(w, `{}`)
})

ctx := context.Background()
_, _, _, err := client.Repositories.GetContents(ctx, "o", "r", "some directory+name/file.go", &RepositoryContentGetOptions{})
_, _, _, err := client.Repositories.GetContents(ctx, "o", "r", "some%20directory+name/file.go", &RepositoryContentGetOptions{})
if err != nil {
t.Fatalf("Repositories.GetContents returned error: %v", err)
}
Expand Down
19 changes: 11 additions & 8 deletions github/repos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,9 @@ func TestRepositoriesService_ListBranches(t *testing.T) {
})
}

// Test removed: "feat/branch-50%" registered with the same pattern as "b".
// Reason: The new logic in ServeMux requires unique patterns.
// This test is no longer necessary as the pattern is already covered by another test.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you proceed, note that the feat/branch-50% case is important because of:
#2948
So if it is the same pattern as "b", then the "b" case should be removed and the more challenging case should remain.

Although I'm a bit confused by the comment because it says "Test removed" but I'm not seeing its removal (which is actually good... so maybe the comment just needs updating?).

func TestRepositoriesService_GetBranch(t *testing.T) {
t.Parallel()
client, mux, _ := setup(t)
Expand All @@ -925,7 +928,7 @@ func TestRepositoriesService_GetBranch(t *testing.T) {
urlPath string
}{
{branch: "b", urlPath: "/repos/o/r/branches/b"},
{branch: "feat/branch-50%", urlPath: "/repos/o/r/branches/feat/branch-50%"},
{branch: "feat/branch-50%", urlPath: "/repos/o/r/branches/feat%2Fbranch-50%25"},
}

for _, test := range tests {
Expand Down Expand Up @@ -959,13 +962,13 @@ func TestRepositoriesService_GetBranch(t *testing.T) {
if !cmp.Equal(branch, want) {
t.Errorf("Repositories.GetBranch returned %+v, want %+v", branch, want)
}

const methodName = "GetBranch"
testBadOptions(t, methodName, func() (err error) {
_, _, err = client.Repositories.GetBranch(ctx, "\n", "\n", "\n", 0)
return err
})
}

const methodName = "GetBranch"
testBadOptions(t, methodName, func() (err error) {
_, _, err = client.Repositories.GetBranch(context.Background(), "\n", "\n", "\n", 0)
return err
})
}

func TestRepositoriesService_GetBranch_BadJSONResponse(t *testing.T) {
Expand Down Expand Up @@ -1309,7 +1312,7 @@ func TestRepositoriesService_GetBranchProtection_noDismissalRestrictions(t *test
enforceAdminsURLPath string
}{
{branch: "b", urlPath: "/repos/o/r/branches/b/protection", enforceAdminsURLPath: "/repos/o/r/branches/b/protection/enforce_admins"},
{branch: "feat/branch-50%", urlPath: "/repos/o/r/branches/feat/branch-50%/protection", enforceAdminsURLPath: "/repos/o/r/branches/feat/branch-50%/protection/enforce_admins"},
{branch: "feat/branch-50%", urlPath: "/repos/o/r/branches/feat%2Fbranch-50%25/protection", enforceAdminsURLPath: "/repos/o/r/branches/feat%2Fbranch-50%25/protection/enforce_admins"},
}

for _, test := range tests {
Expand Down
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载