github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12180 from brendandburns/queue

Browse Source 
Fix a small bug in contrib/submit-queue, add a unit test.
This commit is contained in:
Alex Mohr 2015-08-03 18:00:26 -07:00
commit b280549930
2 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/submit-queue/github/github.go
View File

@ -96,7 +96,7 @@ func validateLGTMAfterPush(client *github.Client, user, project string, pr *gith
for ix := range events {
event := &events[ix]
if *event.Event == "labeled" && *event.Label.Name == "lgtm" {
*lgtmTime = *event.CreatedAt
lgtmTime = event.CreatedAt
}
}
if lgtmTime == nil {

76
contrib/submit-queue/github/github_test.go
View File

@ -24,11 +24,14 @@ import (
"net/url"
"strconv"
"testing"
"time"
"github.com/google/go-github/github"
)
func stringPtr(val string) *string { return &val }
func stringPtr(val string) *string { return &val }
func timePtr(val time.Time) *time.Time { return &val }
func intPtr(val int) *int { return &val }
func TestHasLabel(t *testing.T) {
tests := []struct {
@ -388,3 +391,74 @@ func TestComputeStatus(t *testing.T) {
}
}
}
func TestValidateLGTMAfterPush(t *testing.T) {
tests := []struct {
issueEvents []github.IssueEvent
shouldPass bool
pull github.PullRequest
}{
{
issueEvents: []github.IssueEvent{
{
Event: stringPtr("labeled"),
Label: &github.Label{
Name: stringPtr("lgtm"),
},
CreatedAt: timePtr(time.Unix(10, 0)),
},
},
pull: github.PullRequest{
Number: intPtr(1),
Head: &github.PullRequestBranch{
Repo: &github.Repository{
PushedAt: &github.Timestamp{time.Unix(9, 0)},
},
},
},
shouldPass: true,
},
{
issueEvents: []github.IssueEvent{
{
Event: stringPtr("labeled"),
Label: &github.Label{
Name: stringPtr("lgtm"),
},
CreatedAt: timePtr(time.Unix(10, 0)),
},
},
pull: github.PullRequest{
Number: intPtr(1),
Head: &github.PullRequestBranch{
Repo: &github.Repository{
PushedAt: &github.Timestamp{time.Unix(11, 0)},
},
},
},
shouldPass: false,
},
}
for _, test := range tests {
client, server, mux := initTest()
mux.HandleFunc(fmt.Sprintf("/repos/o/r/issues/%d/events", test.pull.Number), func(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" {
t.Errorf("Unexpected method: %s", r.Method)
}
w.WriteHeader(http.StatusOK)
data, err := json.Marshal(test.issueEvents)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
w.Write(data)
ok, err := validateLGTMAfterPush(client, "o", "r", &test.pull)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if ok != test.shouldPass {
t.Errorf("expected: %v, saw: %v", test.shouldPass, ok)
}
})
server.Close()
}
}