Parse r+ await

Author: camelid

homu/parse_issue_comment.py

@@ -28,6 +28,13 @@ def approve(cls, approver, commit):
         command.actor = approver.lstrip('@')
         return command
 
+    @classmethod
+    def approve_await(cls, approver, commit):
+        command = cls('approve-await')
+        command.commit = commit
+        command.actor = approver.lstrip('@')
+        return command
+
     @classmethod
     def unapprove(cls):
         return cls('unapprove')
@@ -183,15 +190,26 @@ def parse_issue_comment(username, body, sha, botname, hooks=[]):
             if i + 1 < len(words) and is_sha(words[i + 1]):
                 approved_sha = words[i + 1]
                 words[i + 1] = None
+                i += 1
 
             approver = word[len('r='):] if word.startswith('r=') else username
 
             # Ignore "r=me"
             if approver == 'me':
                 continue
 
-            commands.append(
-                    IssueCommentCommand.approve(approver, approved_sha))
+            await_ci = False
+            if i + 1 < len(words) and words[i + 1] == 'await':
+                await_ci = True
+                words[i + 1] = None
+                i += 1
+
+            if await_ci:
+                commands.append(
+                        IssueCommentCommand.approve_await(approver, approved_sha))
+            else:
+                commands.append(
+                        IssueCommentCommand.approve(approver, approved_sha))
 
         elif word == 'r-':
             commands.append(IssueCommentCommand.unapprove())

homu/tests/test_parse_issue_comment.py

@@ -52,6 +52,36 @@ def test_r_plus_with_sha():
     assert command.actor == 'jack'
     assert command.commit == other_commit
 
+def test_r_plus_await():
+    """
+    @bors r+ await
+    """
+
+    author = "jack"
+    body = "@bors r+ await"
+    commands = parse_issue_comment(author, body, commit, "bors")
+
+    assert len(commands) == 1
+    command = commands[0]
+    assert command.action == 'approve-await'
+    assert command.actor == 'jack'
+
+
+def test_r_plus_await_with_sha():
+    """
+    @bors r+ {sha} await
+    """
+
+    author = "jack"
+    body = "@bors r+ {} await".format(other_commit)
+    commands = parse_issue_comment(author, body, commit, "bors")
+
+    assert len(commands) == 1
+    command = commands[0]
+    assert command.action == 'approve-await'
+    assert command.actor == 'jack'
+    assert command.commit == other_commit
+
 
 def test_r_equals():
     """
@@ -83,6 +113,36 @@ def test_r_equals_at_user():
     assert command.actor == 'jill'
 
 
+def test_r_equals_await():
+    """
+    @bors r=jill await
+    """
+
+    author = "jack"
+    body = "@bors r=jill await"
+    commands = parse_issue_comment(author, body, commit, "bors")
+
+    assert len(commands) == 1
+    command = commands[0]
+    assert command.action == 'approve-await'
+    assert command.actor == 'jill'
+
+
+def test_r_equals_at_user():
+    """
+    @bors r=@jill await
+    """
+
+    author = "jack"
+    body = "@bors r=@jill await"
+    commands = parse_issue_comment(author, body, commit, "bors")
+
+    assert len(commands) == 1
+    command = commands[0]
+    assert command.action == 'approve-await'
+    assert command.actor == 'jill'
+
+
 def test_hidden_r_equals():
     author = "bors"
     body = """