Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions submitqueue/extension/changeprovider/github/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,6 @@ func (p *provider) fetchAllPRs(
return nil, fmt.Errorf("failed to fetch PR #%d: %w", cid.PRNumber, err)
}

if err := validatePRStaleness(cid, prData); err != nil {
return nil, err
}

changeInfo := convertToChangeInfo(cid, prData)
changeInfos = append(changeInfos, changeInfo)

Expand Down Expand Up @@ -137,6 +133,10 @@ func (p *provider) fetchPullRequest(ctx context.Context, parsed entitygithub.Cha
return nil, err
}

if err := validatePRStaleness(parsed, data); err != nil {
return nil, err
}

if cursor == "" {
prData = *data
}
Expand Down
40 changes: 40 additions & 0 deletions submitqueue/extension/changeprovider/github/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package github
import (
"context"
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
"testing"
Expand Down Expand Up @@ -160,6 +161,45 @@ func TestProvider_Get_Pagination(t *testing.T) {
assert.Len(t, infos[0].Details.ChangedFiles, 2)
}

func TestProvider_Get_PaginationRejectsStaleHead(t *testing.T) {
for _, tt := range []struct {
name string
headSHAs []string
wantCalls int
}{
{name: "first page", headSHAs: []string{shaNew, shaXYZ}, wantCalls: 1},
{name: "middle page", headSHAs: []string{shaXYZ, shaNew, shaXYZ}, wantCalls: 2},
{name: "last page", headSHAs: []string{shaXYZ, shaNew}, wantCalls: 2},
} {
t.Run(tt.name, func(t *testing.T) {
callCount := 0
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
require.Less(t, callCount, len(tt.headSHAs))
headSHA := tt.headSHAs[callCount]
callCount++
servePR(t, w, pullRequestData{
Number: 456,
HeadRefOid: headSHA,
Files: filesData{
PageInfo: pageInfo{EndCursor: fmt.Sprintf("cursor%d", callCount), HasNextPage: callCount < len(tt.headSHAs)},
Nodes: []fileNode{{Path: fmt.Sprintf("file%d.go", callCount)}},
},
})
}))
t.Cleanup(server.Close)

p := newTestProvider(t, server.URL)
infos, err := p.Get(context.Background(), entity.Request{Change: change.Change{
URIs: []string{"github://github.example.com/uber/submitqueue/pull/456/" + shaXYZ},
}})

require.Error(t, err)
assert.Empty(t, infos)
assert.Equal(t, tt.wantCalls, callCount)
})
}
}

func TestProvider_Get_MultiplePRs(t *testing.T) {
prData := []pullRequestData{
{Number: 123, HeadRefOid: shaA, Files: filesData{Nodes: []fileNode{{Path: "file1.go"}}}},
Expand Down