Pushed commits reset the try_ state

Author: bryanburgers

homu/main.py

@@ -1182,14 +1182,18 @@ def synchronize(repo_label, repo_cfg, logger, gh, states, repos, db, mergeable_q
 #                    status = info.state
 #                    break
 
-        if pull.number in [60966, 60730, 60547, 59312]:
-            # TODO: WHY DOES THIS HAPPEN!?
-            print("Skipping {} because GraphQL never returns a success!".format(pull.number))
-            continue
+#        if pull.number in [60966, 60730, 60547, 59312]:
+#            # TODO: WHY DOES THIS HAPPEN!?
+#            # Reported to GitHub. They're working on it.
+#            print("Skipping {} because GraphQL never returns a success!".format(pull.number))
+#            continue
 
         print("{}/{}#{}".format(repo_cfg['owner'], repo_cfg['name'], pull.number))
         access_token = global_cfg['github']['access_token']
-        response = all_pull_request_events(access_token, repo_cfg['owner'], repo_cfg['name'], pull.number)
+        try:
+            response = all_pull_request_events(access_token, repo_cfg['owner'], repo_cfg['name'], pull.number)
+        except:
+            continue
         status = ''
 
         state = PullReqState(pull.number, pull.head.sha, status, db, repo_label, mergeable_que, gh, repo_cfg['owner'], repo_cfg['name'], repo_cfg.get('labels', {}), repos)  # noqa

homu/pull_req_state.py

@@ -351,6 +351,11 @@ def process_event(self, event):
             # New commits come in: no longer approved
             result.changed = result.changed or self.approved_by != ''
             self.approved_by = ''
+            result.changed = result.changed or self.try_ != False
+            self.try_ = False
+            # TODO: Do we *always* reset the state?
+            result.changed = result.changed or self.status != ''
+            self.status = ''
 
         elif event.event_type == 'HeadRefForcePushedEvent':
             result.changed = self.head_sha != event['afterCommit']['oid']
@@ -412,6 +417,7 @@ def process_event(self, event):
 
         elif event.event_type in [
                 'SubscribedEvent',
+                'UnsubscribedEvent',
                 'MentionedEvent',
                 'LabeledEvent',
                 'UnlabeledEvent',

homu/pull_request_events.py

@@ -231,6 +231,8 @@ def all(access_token, owner, repo, pull):
     result.repo = repo
     result.pull = pull
 
+    attempt = 1
+
     while True:
         response = one(access_token=access_token,
                        owner=owner,
@@ -245,6 +247,9 @@ def all(access_token, owner, repo, pull):
         r = response.json()
 
         if 'errors' in r:
+            if attempt == 10:
+                raise Exception("Too many errors")
+            attempt += 1
             print("GraphQL query failed:")
             for error in r['errors']:
                 print(" * {}".format(error['message']))

homu/tests/test_process_event.py

@@ -363,6 +363,59 @@ def test_try_failed(_):
     assert state.get_status() == 'failure'
 
 
+@unittest.mock.patch('homu.pull_req_state.assert_authorized',
+                     side_effect=return_true)
+def test_try_reset_by_push(_):
+    """
+    Test that a pull request that has been tried, and new commits pushed, does
+    not show up as tried
+    """
+
+    state = new_state()
+    result = state.process_event(create_event({
+        'eventType': 'IssueComment',
+        'author': {
+            'login': 'bors',
+        },
+        'body': '''
+            :hourglass: Trying commit 065151f8b2c31d9e4ddd34aaf8d3263a997f5cfe with merge 330c85d9270b32d7703ebefc337eb37ae959f741...
+            <!-- homu: {"type":"TryBuildStarted","head_sha":"065151f8b2c31d9e4ddd34aaf8d3263a997f5cfe","merge_sha":"330c85d9270b32d7703ebefc337eb37ae959f741"} -->
+        ''', # noqa
+        'publishedAt': '1985-04-21T00:00:00Z',
+    }))
+
+    assert result.changed is True
+    assert state.try_ is True
+    assert state.get_status() == 'pending'
+
+    result = state.process_event(create_event({
+        'eventType': 'IssueComment',
+        'author': {
+            'login': 'bors',
+        },
+        'body': '''
+            :sunny: Try build successful - [checks-travis](https://travis-ci.com/rust-lang/rust/builds/115542062) Build commit: 330c85d9270b32d7703ebefc337eb37ae959f741
+            <!-- homu: {"type":"TryBuildCompleted","builders":{"checks-travis":"https://travis-ci.com/rust-lang/rust/builds/115542062"},"merge_sha":"330c85d9270b32d7703ebefc337eb37ae959f741"} -->
+        ''', # noqa
+        'publishedAt': '1985-04-21T00:01:00Z',
+    }))
+
+    assert result.changed is True
+    assert state.try_ is True
+    assert state.get_status() == 'success'
+
+    result = state.process_event(create_event({
+        'eventType': 'PullRequestCommit',
+        'commit': {
+            'oid': '012345',
+        }
+    }))
+
+    assert result.changed is True
+    assert state.try_ is False
+    assert state.get_status() == ''
+
+
 @unittest.mock.patch('homu.pull_req_state.assert_authorized',
                      side_effect=return_true)
 def test_build(_):
@@ -403,7 +456,7 @@ def test_build(_):
 
     assert result.changed is True
     assert state.try_ is False
-    assert state.get_status() == 'success'
+    assert state.get_status() == 'completed'
 
 
 @unittest.mock.patch('homu.pull_req_state.assert_authorized',
@@ -427,7 +480,7 @@ def test_build_failed(_):
     }))
 
     assert result.changed is True
-    assert state.try_ is True
+    assert state.try_ is False
     assert state.get_status() == 'pending'
 
     result = state.process_event(create_event({
@@ -443,7 +496,7 @@ def test_build_failed(_):
     }))
 
     assert result.changed is True
-    assert state.try_ is True
+    assert state.try_ is False
     assert state.get_status() == 'failure'