From 6732517c1d401b3cc81cd4dc28782461016c89d0 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 27 Aug 2018 13:57:58 +1000 Subject: [PATCH] Change MainClass.get_repo default laziness (#882) MainClass.get_repo() used to default to lazy fetching, which is not what NamedUser.get_repo() does, so change the default. Fix the tess to pass lazy=True, so that we don't need to grow 8 ReplayData files with 11 lines of the repository in question. Fixes #353 --- github/MainClass.py | 2 +- github/tests/BadAttributes.py | 2 +- github/tests/Branch.py | 2 +- github/tests/CommitCombinedStatus.py | 2 +- github/tests/Issue494.py | 2 +- github/tests/IssueEvent.py | 55 +++++++++++----------- github/tests/PullRequest.py | 9 ++-- github/tests/PullRequestReview.py | 2 +- github/tests/RequiredPullRequestReviews.py | 2 +- 9 files changed, 40 insertions(+), 38 deletions(-) diff --git a/github/MainClass.py b/github/MainClass.py index 2437778e2a..00a18650dc 100644 --- a/github/MainClass.py +++ b/github/MainClass.py @@ -273,7 +273,7 @@ def get_organizations(self, since=github.GithubObject.NotSet): url_parameters ) - def get_repo(self, full_name_or_id, lazy=True): + def get_repo(self, full_name_or_id, lazy=False): """ :calls: `GET /repos/:owner/:repo `_ or `GET /repositories/:id `_ :rtype: :class:`github.Repository.Repository` diff --git a/github/tests/BadAttributes.py b/github/tests/BadAttributes.py index 462b8203ff..d8f1997133 100755 --- a/github/tests/BadAttributes.py +++ b/github/tests/BadAttributes.py @@ -85,7 +85,7 @@ def testBadAttributeInClassAttribute(self): self.assertEqual(raisedexp.exception.actual_value, 42) def testBadTransformedAttributeInList(self): - commit = self.g.get_repo("klmitch/turnstile").get_commit("38d9082a898d0822b5ccdfd78f3a536e2efa6c26") + commit = self.g.get_repo("klmitch/turnstile", lazy=True).get_commit("38d9082a898d0822b5ccdfd78f3a536e2efa6c26") with self.assertRaises(github.BadAttributeException) as raisedexp: commit.files diff --git a/github/tests/Branch.py b/github/tests/Branch.py index 36bdc77166..77ccbee4c7 100644 --- a/github/tests/Branch.py +++ b/github/tests/Branch.py @@ -41,7 +41,7 @@ def setUp(self): self.repo = self.g.get_user().get_repo("PyGithub") self.branch = self.repo.get_branch("topic/RewriteWithGeneratedCode") self.protected_branch = self.repo.get_branch("integrations") - self.organization_branch = self.g.get_repo("PyGithub/PyGithub").get_branch("master") + self.organization_branch = self.g.get_repo("PyGithub/PyGithub", lazy=True).get_branch("master") def testAttributes(self): self.assertEqual(self.branch.name, "topic/RewriteWithGeneratedCode") diff --git a/github/tests/CommitCombinedStatus.py b/github/tests/CommitCombinedStatus.py index f198c20e81..1ed791677d 100644 --- a/github/tests/CommitCombinedStatus.py +++ b/github/tests/CommitCombinedStatus.py @@ -34,7 +34,7 @@ class CommitCombinedStatus(Framework.TestCase): def setUp(self): Framework.TestCase.setUp(self) - self.combined_status = self.g.get_repo("edx/edx-platform").get_commit("74e70119a23fa3ffb3db19d4590eccfebd72b659").get_combined_status() + self.combined_status = self.g.get_repo("edx/edx-platform", lazy=True).get_commit("74e70119a23fa3ffb3db19d4590eccfebd72b659").get_combined_status() def testAttributes(self): self.assertEqual(self.combined_status.state, "success") diff --git a/github/tests/Issue494.py b/github/tests/Issue494.py index f22b878b29..28340612d1 100644 --- a/github/tests/Issue494.py +++ b/github/tests/Issue494.py @@ -29,7 +29,7 @@ class Issue494(Framework.TestCase): def setUp(self): Framework.TestCase.setUp(self) - self.repo = self.g.get_repo("apache/brooklyn-server") + self.repo = self.g.get_repo("apache/brooklyn-server", lazy=True) self.pull = self.repo.get_pull(465) def testRepr(self): diff --git a/github/tests/IssueEvent.py b/github/tests/IssueEvent.py index 4df5031219..7e6f814074 100644 --- a/github/tests/IssueEvent.py +++ b/github/tests/IssueEvent.py @@ -36,41 +36,42 @@ class IssueEvent(Framework.TestCase): def setUp(self): Framework.TestCase.setUp(self) + repo = self.g.get_repo("PyGithub/PyGithub", lazy=True) # From Issue #30 - self.event_subscribed = self.g.get_repo("PyGithub/PyGithub").get_issues_event(16347479) - self.event_assigned = self.g.get_repo("PyGithub/PyGithub").get_issues_event(16347480) - self.event_referenced = self.g.get_repo("PyGithub/PyGithub").get_issues_event(16348656) - self.event_closed = self.g.get_repo("PyGithub/PyGithub").get_issues_event(16351220) - self.event_labeled = self.g.get_repo("PyGithub/PyGithub").get_issues_event(98136337) + self.event_subscribed = repo.get_issues_event(16347479) + self.event_assigned = repo.get_issues_event(16347480) + self.event_referenced = repo.get_issues_event(16348656) + self.event_closed = repo.get_issues_event(16351220) + self.event_labeled = repo.get_issues_event(98136337) # From Issue 538 - self.event_mentioned = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1009034767) - self.event_merged = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1015402964) - self.event_review_requested = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1011101309) + self.event_mentioned = repo.get_issues_event(1009034767) + self.event_merged = repo.get_issues_event(1015402964) + self.event_review_requested = repo.get_issues_event(1011101309) # From Issue 857 - self.event_reopened = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1782463023) - self.event_unassigned = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1782463379) - self.event_unlabeled = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1782463917) - self.event_renamed = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1782472556) - self.event_base_ref_changed = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1782915693) - self.event_head_ref_deleted = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1782917185) - self.event_head_ref_restored = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1782917299) - self.event_milestoned = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1783596418) - self.event_demilestoned = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1783596452) - self.event_locked = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1783596743) - self.event_unlocked = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1783596818) - self.event_review_dismissed = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1783605084) - self.event_review_request_removed = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1783779835) - self.event_marked_as_duplicate = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1783779725) - self.event_unmarked_as_duplicate = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1789228962) - self.event_added_to_project = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1791766828) - self.event_moved_columns_in_project = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1791767766) - self.event_removed_from_project = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1791768212) + self.event_reopened = repo.get_issues_event(1782463023) + self.event_unassigned = repo.get_issues_event(1782463379) + self.event_unlabeled = repo.get_issues_event(1782463917) + self.event_renamed = repo.get_issues_event(1782472556) + self.event_base_ref_changed = repo.get_issues_event(1782915693) + self.event_head_ref_deleted = repo.get_issues_event(1782917185) + self.event_head_ref_restored = repo.get_issues_event(1782917299) + self.event_milestoned = repo.get_issues_event(1783596418) + self.event_demilestoned = repo.get_issues_event(1783596452) + self.event_locked = repo.get_issues_event(1783596743) + self.event_unlocked = repo.get_issues_event(1783596818) + self.event_review_dismissed = repo.get_issues_event(1783605084) + self.event_review_request_removed = repo.get_issues_event(1783779835) + self.event_marked_as_duplicate = repo.get_issues_event(1783779725) + self.event_unmarked_as_duplicate = repo.get_issues_event(1789228962) + self.event_added_to_project = repo.get_issues_event(1791766828) + self.event_moved_columns_in_project = repo.get_issues_event(1791767766) + self.event_removed_from_project = repo.get_issues_event(1791768212) # From Issue 866 - self.event_converted_note_to_issue = self.g.get_repo("PyGithub/PyGithub").get_issues_event(1791769149) + self.event_converted_note_to_issue = repo.get_issues_event(1791769149) def testEvent_subscribed_Attributes(self): self.assertEqual(self.event_subscribed.actor.login, "jacquev6") diff --git a/github/tests/PullRequest.py b/github/tests/PullRequest.py index e2d0b77141..b33914f55c 100644 --- a/github/tests/PullRequest.py +++ b/github/tests/PullRequest.py @@ -42,10 +42,11 @@ def setUp(self): self.repo = self.g.get_user().get_repo("PyGithub") self.pull = self.repo.get_pull(31) - self.pullIssue256Closed = self.g.get_repo("MarcoFalke/PyGithub").get_pull(1) - self.pullIssue256Merged = self.g.get_repo("MarcoFalke/PyGithub").get_pull(2) - self.pullIssue256Conflict = self.g.get_repo("MarcoFalke/PyGithub").get_pull(3) - self.pullIssue256Uncached = self.g.get_repo("MarcoFalke/PyGithub").get_pull(4) + marco_repo = self.g.get_repo("MarcoFalke/PyGithub", lazy=True) + self.pullIssue256Closed = marco_repo.get_pull(1) + self.pullIssue256Merged = marco_repo.get_pull(2) + self.pullIssue256Conflict = marco_repo.get_pull(3) + self.pullIssue256Uncached = marco_repo.get_pull(4) def testAttributesIssue256(self): self.assertEqual(self.pullIssue256Closed.closed_at, datetime.datetime(2018, 5, 22, 14, 50, 43)) diff --git a/github/tests/PullRequestReview.py b/github/tests/PullRequestReview.py index 7e4e16d976..10103e5d5d 100644 --- a/github/tests/PullRequestReview.py +++ b/github/tests/PullRequestReview.py @@ -34,7 +34,7 @@ class PullRequestReview(Framework.TestCase): def setUp(self): Framework.TestCase.setUp(self) - self.repo = self.g.get_repo("PyGithub/PyGithub") + self.repo = self.g.get_repo("PyGithub/PyGithub", lazy=True) self.pull = self.repo.get_pull(538) # Test ability to create a review diff --git a/github/tests/RequiredPullRequestReviews.py b/github/tests/RequiredPullRequestReviews.py index e8c95d6bf6..36dbc3450d 100644 --- a/github/tests/RequiredPullRequestReviews.py +++ b/github/tests/RequiredPullRequestReviews.py @@ -41,6 +41,6 @@ def testAttributes(self): self.assertEqual(self.required_pull_request_reviews.__repr__(), 'RequiredPullRequestReviews(url="https://api.github.com/repos/jacquev6/PyGithub/branches/integrations/protection/required_pull_request_reviews", require_code_owner_reviews=True, dismiss_stale_reviews=True)') def testOrganizationOwnedTeam(self): - required_pull_request_reviews = self.g.get_repo("PyGithub/PyGithub").get_branch("integrations").get_required_pull_request_reviews() + required_pull_request_reviews = self.g.get_repo("PyGithub/PyGithub", lazy=True).get_branch("integrations").get_required_pull_request_reviews() self.assertListKeyEqual(required_pull_request_reviews.dismissal_users, lambda u: u.login, ["jacquev6"]) self.assertListKeyEqual(required_pull_request_reviews.dismissal_teams, lambda t: t.slug, ["pygithub-owners"])