improve tests

Author: oulgen

src/ghstack/github_fake.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import dataclasses
 import os.path
 import re
 from dataclasses import dataclass
@@ -271,6 +272,8 @@ class PullRequest(Node):
     # state: PullRequestState
     title: str
     url: str
+    reviewers: List[str] = dataclasses.field(default_factory=list)
+    labels: List[str] = dataclasses.field(default_factory=list)
 
     def repository(self, info: GraphQLResolveInfo) -> Repository:
         return github_state(info).repositories[self._repository]
@@ -476,10 +479,20 @@ def rest(self, method: str, path: str, **kwargs: Any) -> Any:
             if m := re.match(
                 r"^repos/([^/]+)/([^/]+)/pulls/([^/]+)/requested_reviewers", path
             ):
-                # Handle adding reviewers - just return success for testing
+                # Handle adding reviewers
+                state = self.state
+                repo = state.repository(m.group(1), m.group(2))
+                pr = state.pull_request(repo, GitHubNumber(int(m.group(3))))
+                reviewers = kwargs.get("reviewers", [])
+                pr.reviewers.extend(reviewers)
                 return {}
             if m := re.match(r"^repos/([^/]+)/([^/]+)/issues/([^/]+)/labels", path):
-                # Handle adding labels - just return success for testing
+                # Handle adding labels
+                state = self.state
+                repo = state.repository(m.group(1), m.group(2))
+                pr = state.pull_request(repo, GitHubNumber(int(m.group(3))))
+                labels = kwargs.get("labels", [])
+                pr.labels.extend(labels)
                 return {}
         elif method == "patch":
             if m := re.match(r"^repos/([^/]+)/([^/]+)(?:/pulls/([^/]+))?$", path):

src/ghstack/test_prelude.py

@@ -51,6 +51,8 @@
     "get_sh",
     "get_upstream_sh",
     "get_github",
+    "get_pr_reviewers",
+    "get_pr_labels",
     "tick",
     "captured_output",
 ]
@@ -390,6 +392,26 @@ def is_direct() -> bool:
     return CTX.direct
 
 
+def get_github() -> ghstack.github_fake.FakeGitHubEndpoint:
+    return CTX.github
+
+
+def get_pr_reviewers(pr_number: int) -> List[str]:
+    """Get the reviewers for a PR number."""
+    github = get_github()
+    repo = github.state.repository("pytorch", "pytorch")
+    pr = github.state.pull_request(repo, ghstack.github_fake.GitHubNumber(pr_number))
+    return pr.reviewers
+
+
+def get_pr_labels(pr_number: int) -> List[str]:
+    """Get the labels for a PR number."""
+    github = get_github()
+    repo = github.state.repository("pytorch", "pytorch")
+    pr = github.state.pull_request(repo, ghstack.github_fake.GitHubNumber(pr_number))
+    return pr.labels
+
+
 def assert_eq(a: Any, b: Any) -> None:
     assert a == b, f"{a} != {b}"
 
@@ -423,9 +445,5 @@ def get_upstream_sh() -> ghstack.shell.Shell:
     return CTX.upstream_sh
 
 
-def get_github() -> ghstack.github.GitHubEndpoint:
-    return CTX.github
-
-
 def tick() -> None:
     CTX.sh.test_tick()

test/submit/cli_reviewer_and_label.py.test

@@ -6,9 +6,19 @@ init_test()
 commit("A")
 (A,) = gh_submit("Initial commit", reviewer="reviewer1", label="bug")
 
+# Verify first PR has correct reviewers and labels
+assert_eq(get_pr_reviewers(500), ["reviewer1"])
+assert_eq(get_pr_labels(500), ["bug"])
+
 # Create second commit with different reviewers/labels
 commit("B")
-(A2, B) = gh_submit("Add B", reviewer="reviewer2,reviewer3", label="enhancement,priority-high")
+(A2, B) = gh_submit(
+    "Add B", reviewer="reviewer2,reviewer3", label="enhancement,priority-high"
+)
+
+# Verify second PR has correct reviewers and labels
+assert_eq(get_pr_reviewers(501), ["reviewer2", "reviewer3"])
+assert_eq(get_pr_labels(501), ["enhancement", "priority-high"])
 
 if is_direct():
     assert_github_state(

test/submit/reviewer_and_label.py.test

@@ -3,7 +3,13 @@ from ghstack.test_prelude import *
 init_test()
 
 commit("A")
-(A,) = gh_submit("Initial commit", reviewer="reviewer1,reviewer2", label="bug,enhancement")
+(A,) = gh_submit(
+    "Initial commit", reviewer="reviewer1,reviewer2", label="bug,enhancement"
+)
+
+# Verify reviewers and labels were added
+assert_eq(get_pr_reviewers(500), ["reviewer1", "reviewer2"])
+assert_eq(get_pr_labels(500), ["bug", "enhancement"])
 
 if is_direct():
     assert_github_state(