fix(Build Cop): only close duplicates when the test was run

packages/buildcop/__snapshots__/buildcop.js

@@ -22,19 +22,27 @@ exports['buildcop app testsFailed comments on an existing open issue when testsF
   "body": "The build failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed"
 }
 
-exports['buildcop app xunitXML opens multiple issues for multiple failures 1'] = {
-  "title": "storage/buckets: TestBucketLock failed",
-  "body": "storage/buckets: TestBucketLock failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
+exports['buildcop app xunitXML opens an issue [Go] 1'] = {
+  "title": "spanner/spanner_snippets: TestSample failed",
+  "body": "spanner/spanner_snippets: TestSample failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
   "labels": [
     "type: bug",
     "priority: p1",
     "buildcop: issue"
   ]
 }
 
-exports['buildcop app xunitXML opens multiple issues for multiple failures 2'] = {
-  "title": "storage/buckets: TestUniformBucketLevelAccess failed",
-  "body": "storage/buckets: TestUniformBucketLevelAccess failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
+exports['buildcop app xunitXML closes a duplicate issue 1'] = {
+  "body": "Closing as a duplicate of #19"
+}
+
+exports['buildcop app xunitXML closes a duplicate issue 2'] = {
+  "state": "closed"
+}
+
+exports['buildcop app xunitXML opens an issue [Python] 1'] = {
+  "title": "appengine.flexible.datastore.main_test: test_index failed",
+  "body": "appengine.flexible.datastore.main_test: test_index failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
   "labels": [
     "type: bug",
     "priority: p1",
@@ -76,30 +84,22 @@ exports['buildcop app xunitXML closes an issue for a passing test [Python] 2'] =
   "state": "closed"
 }
 
-exports['buildcop app xunitXML opens an issue [Go] 1'] = {
-  "title": "spanner/spanner_snippets: TestSample failed",
-  "body": "spanner/spanner_snippets: TestSample failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
+exports['buildcop app xunitXML opens multiple issues for multiple failures 1'] = {
+  "title": "storage/buckets: TestBucketLock failed",
+  "body": "storage/buckets: TestBucketLock failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
   "labels": [
     "type: bug",
     "priority: p1",
     "buildcop: issue"
   ]
 }
 
-exports['buildcop app xunitXML opens an issue [Python] 1'] = {
-  "title": "appengine.flexible.datastore.main_test: test_index failed",
-  "body": "appengine.flexible.datastore.main_test: test_index failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
+exports['buildcop app xunitXML opens multiple issues for multiple failures 2'] = {
+  "title": "storage/buckets: TestUniformBucketLevelAccess failed",
+  "body": "storage/buckets: TestUniformBucketLevelAccess failed\nbuildID: 123\nbuildURL: http://example.com\nstatus: failed",
   "labels": [
     "type: bug",
     "priority: p1",
     "buildcop: issue"
   ]
 }
-
-exports['buildcop app xunitXML closes a duplicate issue 1'] = {
-  "body": "Closing as a duplicate of #17"
-}
-
-exports['buildcop app xunitXML closes a duplicate issue 2'] = {
-  "state": "closed"
-}

packages/buildcop/src/buildcop.ts

@@ -119,7 +119,9 @@ export function buildcop(app: Application) {
       let issues = await context.github.paginate(options);
 
       // If we deduplicate any issues, re-download the issues.
-      if (await buildcop.deduplicateIssues(issues, context, owner, repo)) {
+      if (
+        await buildcop.deduplicateIssues(results, issues, context, owner, repo)
+      ) {
         issues = await context.github.paginate(options);
       }
 
@@ -150,15 +152,22 @@ export function buildcop(app: Application) {
   });
 }
 
-// deduplicate issues closes any duplicate issues and returns whether or not any
+// deduplicateIssues closes any duplicate issues and returns whether or not any
 // were modified.
+// Only issues for tests in results are modified.
 buildcop.deduplicateIssues = async (
+  results: TestResults,
   issues: Octokit.IssuesListForRepoResponseItem[],
   context: PubSubContext,
   owner: string,
   repo: string
 ) => {
-  issues = issues.filter(issue => issue.state === 'open');
+  const tests = results.passes.concat(results.failures);
+  issues = issues.filter(
+    issue =>
+      issue.state === 'open' &&
+      tests.find(test => issue.title === buildcop.formatTestCase(test))
+  );
   const byTitle = new Map<string, Octokit.IssuesListForRepoResponseItem[]>();
   for (const issue of issues) {
     byTitle.set(issue.title, byTitle.get(issue.title) || []);

packages/buildcop/test/buildcop.ts

@@ -782,6 +782,10 @@ describe('buildcop', () => {
             'github.com/GoogleCloudPlatform/golang-samples/spanner/spanner_snippets',
           testCase: 'TestSample',
         });
+        const title2 = formatTestCase({
+          package: 'appengine/go11x/helloworld',
+          testCase: 'TestIndexHandler',
+        });
 
         const requests = nock('https://api.github.com')
           .get(
@@ -801,35 +805,34 @@ describe('buildcop', () => {
               labels: [{ name: 'buildcop: flaky' }],
               state: 'open',
             },
+            {
+              title: title2,
+              number: 18,
+              body: 'Failure!',
+              state: 'open',
+            },
+            {
+              title: title2,
+              number: 19,
+              body: 'Failure!',
+              labels: [{ name: 'buildcop: flaky' }],
+              state: 'open',
+            },
           ])
-          .post('/repos/tbpg/golang-samples/issues/16/comments', body => {
+          .post('/repos/tbpg/golang-samples/issues/18/comments', body => {
             snapshot(body);
             return true;
           })
           .reply(200)
-          .patch('/repos/tbpg/golang-samples/issues/16', body => {
+          .patch('/repos/tbpg/golang-samples/issues/18', body => {
             snapshot(body);
             return true;
           })
           .reply(200)
           .get(
             '/repos/tbpg/golang-samples/issues?per_page=100&labels=buildcop%3A%20issue&state=all'
           )
-          .reply(200, [
-            {
-              title,
-              number: 16,
-              body: 'Failure!',
-              state: 'closed',
-            },
-            {
-              title,
-              number: 17,
-              body: 'Failure!',
-              labels: [{ name: 'buildcop: flaky' }],
-              state: 'open',
-            },
-          ]);
+          .reply(200, []); // Real response would include all issues again.
 
         await probot.receive({ name: 'pubsub.message', payload, id: 'abc123' });