Merge pull request #1232 from freehan/autopfix

fix bug in auto prioritization

Author: lavalamp

mungegithub/mungers/flake-manager.go

@@ -33,6 +33,9 @@ import (
 	"time"
 )
 
+// failedStr is for comment matching during auto prioritization
+const failedStr = "Failed: "
+
 // issueFinder finds an issue for a given key.
 type issueFinder interface {
 	AllIssuesForKey(key string) []int
@@ -194,7 +197,7 @@ func (p *individualFlakeSource) ID() string {
 
 // Body implements IssueSource
 func (p *individualFlakeSource) Body(newIssue bool) string {
-	extraInfo := fmt.Sprintf("Failed: %v\n\n```\n%v\n```\n\n", p.Title(), p.flake.Reason)
+	extraInfo := fmt.Sprintf(failedStr+"%v\n\n```\n%v\n```\n\n", p.Title(), p.flake.Reason)
 	body := makeGubernatorLink(p.ID()) + "\n" + extraInfo
 
 	if !newIssue {
@@ -249,13 +252,13 @@ func (p *brokenJobSource) ID() string {
 func (p *brokenJobSource) Body(newIssue bool) string {
 	url := makeGubernatorLink(p.ID())
 	if p.result.Status == cache.ResultFailed {
-		return fmt.Sprintf("%v\nRun so broken it didn't make JUnit output!", url)
+		return fmt.Sprintf(failedStr+"%v\nRun so broken it didn't make JUnit output!", url)
 	}
 	body := fmt.Sprintf("%v\nMultiple broken tests:\n\n", url)
 
 	sections := []string{}
 	for testName, reason := range p.result.Flakes {
-		text := fmt.Sprintf("Failed: %v\n\n```\n%v\n```\n", testName, reason)
+		text := fmt.Sprintf(failedStr+"%v\n\n```\n%v\n```\n", testName, reason)
 		// Reference previous issues if we know of any.
 		// (key must batch individualFlakeSource.Title()!)
 		if previousIssues := p.fm.finder.AllIssuesForKey(string(testName)); len(previousIssues) > 0 {
@@ -308,9 +311,9 @@ func autoPrioritize(comments []libgithub.IssueComment, issueCreatedAt *time.Time
 
 	for _, c := range comments {
 		// TODO: think of a better way to identify flake comments
-		// "Failed:" is a special string contained in flake issue filed by flake-manager
+		// "Failed: " is a special string contained in flake issue filed by flake-manager
 		// Please make sure it matches the body generated by IssueSource.Body()
-		if !sync.RobotUser.Has(*c.User.Login) || !strings.Contains(*c.Body, "Failed:") {
+		if !sync.RobotUser.Has(*c.User.Login) || !strings.Contains(*c.Body, failedStr) {
 			continue
 		}
 		occurence = append(occurence, c.CreatedAt)

mungegithub/mungers/flake-manager_test.go

@@ -87,7 +87,7 @@ func TestBrokenJobSource(t *testing.T) {
 }
 
 func flakecomment(id int, createdAt time.Time) github.IssueComment {
-	return github_testing.Comment(id, "k8s-bot", createdAt, "Failed:")
+	return github_testing.Comment(id, "k8s-bot", createdAt, "Failed: something failed")
 }
 
 func TestAutoPrioritize(t *testing.T) {