- fixes according to PEP8;

CenterForOpenScience · May 6, 2024 · 368a119 · 368a119
1 parent 5d37516
commit 368a119
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 105 deletions.
diff --git a/addons/github/tests/test_views.py b/addons/github/tests/test_views.py
@@ -392,6 +392,48 @@ def setUp(self):
         self.node_settings.save()
 
 
+USER = 'octo-cat'
+REPO_AUTHOR = {
+    'name': USER,
+    'email': 'njqpw@osf.io',
+    'avatar_url': 'https://gravatar.com/avatar/c74f9cfd7776305a82ede0b765d65402?d=https%3A%2F'
+                  '%2Fidenticons.github.com%2F3959fe3bcd263a12c28ae86a66ec75ef.png&r=x',
+    'events_url': 'https://api.github.com/users/{user}/events{{/privacy}}',
+    'followers_url': 'https://api.github.com/users/{user}/followers',
+    'following_url': 'https://api.github.com/users/{user}/following{{/other_user}}',
+    'gists_url': 'https://api.github.com/users/{user}/gists{{/gist_id}}',
+    'gravatar_id': 'c74f9cfd7776305a82ede0b765d65402',
+    'html_url': 'https://github.com/{user}',
+    'id': 2379650,
+    'login': '{user}',
+    'organizations_url': 'https://api.github.com/users/{user}/orgs',
+    'received_events_url': 'https://api.github.com/users/{user}/received_events',
+    'repos_url': 'https://api.github.com/users/{user}/repos',
+    'site_admin': False,
+    'starred_url': 'https://api.github.com/users/{user}/starred{{/owner}}{{/repo}}',
+    'subscriptions_url': 'https://api.github.com/users/{'
+                         'user}/subscriptions',
+    'type': 'User',
+    'url': 'https://api.github.com/users/{user}'
+}
+REPO_COMMIT = {
+    'ETag': '',
+    'Last-Modified': '',
+    'url': '',
+    'author': REPO_AUTHOR,
+    'committer': {'name': '{user}', 'email': '{user}@osf.io',
+                  'username': 'tester'},
+    'message': 'Fixed error',
+    'tree': {'url': 'https://docs.github.com/en/rest/git/trees',
+             'sha': 'e22d92d5d90bb8f9695e9a5e2e2311a5c1997230'},
+}
+REPO_PARENTS = [
+    '12345',
+    'https://api.example.com/entities/67890',
+    'another-entity-id'
+]
+
+
 class TestGithubSettings(OsfTestCase):
 
     def setUp(self):
@@ -474,48 +516,6 @@ def test_link_repo_non_existent(self, mock_repo):
 
         assert res.status_code == 400
 
-    user = 'octo-cat'
-    repo_author = {
-        'name': f'{user}',
-        'email': 'njqpw@osf.io',
-        'avatar_url': 'https://gravatar.com/avatar/c74f9cfd7776305a82ede0b765d65402?d=https%3A%2F'
-                      '%2Fidenticons.github.com%2F3959fe3bcd263a12c28ae86a66ec75ef.png&r=x',
-        'events_url': 'https://api.github.com/users/{user}/events{{/privacy}}',
-        'followers_url': 'https://api.github.com/users/{user}/followers',
-        'following_url': 'https://api.github.com/users/{user}/following{{/other_user}}',
-        'gists_url': 'https://api.github.com/users/{user}/gists{{/gist_id}}',
-        'gravatar_id': 'c74f9cfd7776305a82ede0b765d65402',
-        'html_url': 'https://github.com/{user}',
-        'id': 2379650,
-        'login': '{user}',
-        'organizations_url': 'https://api.github.com/users/{user}/orgs',
-        'received_events_url': 'https://api.github.com/users/{user}/received_events',
-        'repos_url': 'https://api.github.com/users/{user}/repos',
-        'site_admin': False,
-        'starred_url': 'https://api.github.com/users/{user}/starred{{/owner}}{{/repo}}',
-        'subscriptions_url': 'https://api.github.com/users/{'
-                             'user}/subscriptions',
-        'type': 'User',
-        'url': 'https://api.github.com/users/{user}'
-    }
-
-    repo_commit = {
-        'ETag': '',
-        'Last-Modified': '',
-        'url': '',
-        'author': repo_author,
-        'committer': {'name': '{user}', 'email': '{user}@osf.io',
-                      'username': 'tester'},
-        'message': 'Fixed error',
-        'tree': {'url': 'https://docs.github.com/en/rest/git/trees',
-                 'sha': 'e22d92d5d90bb8f9695e9a5e2e2311a5c1997230'},
-    }
-    repo_parents = [
-        '12345',
-        'https://api.example.com/entities/67890',
-        'another-entity-id'
-    ]
-
     @mock.patch('addons.github.api.GitHubClient.branches')
     def test_link_repo_registration(self, mock_branches):
         session = GitHubSession()
@@ -524,14 +524,14 @@ def test_link_repo_registration(self, mock_branches):
                 'name': 'master',
                 'commit': {
                     'sha': '444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'url': f'https://api.github.com/repos/{self.user}/mock-repo/commits'
+                    'url': f'https://api.github.com/repos/{USER}/mock-repo/commits'
                            f'/444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'author': self.repo_author,
+                    'author': REPO_AUTHOR,
                     'comments_url': 'https://api.github.com/repos/{user}/mock-repo/comments{{/number}}',
-                    'commit': self.repo_commit,
-                    'committer': self.repo_author,
+                    'commit': REPO_COMMIT,
+                    'committer': REPO_AUTHOR,
                     'html_url': 'https://github.com/{user}',
-                    'parents': self.repo_parents,
+                    'parents': REPO_PARENTS,
 
                 }, '_links': [{
                     'rel': 'self',
@@ -545,14 +545,14 @@ def test_link_repo_registration(self, mock_branches):
                 'name': 'develop',
                 'commit': {
                     'sha': '444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'url': f'https://api.github.com/repos/{self.user}/mock-repo/commits'
+                    'url': f'https://api.github.com/repos/{USER}/mock-repo/commits'
                            f'/444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'author': self.repo_author,
+                    'author': REPO_AUTHOR,
                     'comments_url': 'https://api.github.com/repos/{user}/mock-repo/comments{{/number}}',
-                    'commit': self.repo_commit,
-                    'committer': self.repo_author,
+                    'commit': REPO_COMMIT,
+                    'committer': REPO_AUTHOR,
                     'html_url': 'https://github.com/{user}',
-                    'parents': self.repo_parents,
+                    'parents': REPO_PARENTS,
 
                 }, '_links': [{
                     'rel': 'self',

diff --git a/addons/gitlab/tests/test_views.py b/addons/gitlab/tests/test_views.py
@@ -431,6 +431,48 @@ def setUp(self):
         self.node_settings.save()
 
 
+USER = 'octo-cat'
+REPO_AUTHOR = {
+    'name': USER,
+    'email': 'njqpw@osf.io',
+    'avatar_url': 'https://gravatar.com/avatar/c74f9cfd7776305a82ede0b765d65402?d=https%3A%2F'
+                  '%2Fidenticons.github.com%2F3959fe3bcd263a12c28ae86a66ec75ef.png&r=x',
+    'events_url': 'https://api.github.com/users/{user}/events{{/privacy}}',
+    'followers_url': 'https://api.github.com/users/{user}/followers',
+    'following_url': 'https://api.github.com/users/{user}/following{{/other_user}}',
+    'gists_url': 'https://api.github.com/users/{user}/gists{{/gist_id}}',
+    'gravatar_id': 'c74f9cfd7776305a82ede0b765d65402',
+    'html_url': 'https://github.com/{user}',
+    'id': 2379650,
+    'login': '{user}',
+    'organizations_url': 'https://api.github.com/users/{user}/orgs',
+    'received_events_url': 'https://api.github.com/users/{user}/received_events',
+    'repos_url': 'https://api.github.com/users/{user}/repos',
+    'site_admin': False,
+    'starred_url': 'https://api.github.com/users/{user}/starred{{/owner}}{{/repo}}',
+    'subscriptions_url': 'https://api.github.com/users/{'
+                         'user}/subscriptions',
+    'type': 'User',
+    'url': 'https://api.github.com/users/{user}'
+}
+REPO_COMMIT = {
+    'ETag': '',
+    'Last-Modified': '',
+    'url': '',
+    'author': REPO_AUTHOR,
+    'committer': {'name': '{user}', 'email': '{user}@osf.io',
+                  'username': 'tester'},
+    'message': 'Fixed error',
+    'tree': {'url': 'https://docs.github.com/en/rest/git/trees',
+             'sha': 'e22d92d5d90bb8f9695e9a5e2e2311a5c1997230'},
+}
+REPO_PARENTS = [
+    '12345',
+    'https://api.example.com/entities/67890',
+    'another-entity-id'
+]
+
+
 class TestGitLabSettings(OsfTestCase):
 
     def setUp(self):
@@ -519,48 +561,6 @@ def test_link_repo_non_existent(self, mock_repo):
 
         assert res.status_code == 400
 
-    user = 'octo-cat'
-    repo_author = {
-        'name': f'{user}',
-        'email': 'njqpw@osf.io',
-        'avatar_url': 'https://gravatar.com/avatar/c74f9cfd7776305a82ede0b765d65402?d=https%3A%2F'
-                      '%2Fidenticons.github.com%2F3959fe3bcd263a12c28ae86a66ec75ef.png&r=x',
-        'events_url': 'https://api.github.com/users/{user}/events{{/privacy}}',
-        'followers_url': 'https://api.github.com/users/{user}/followers',
-        'following_url': 'https://api.github.com/users/{user}/following{{/other_user}}',
-        'gists_url': 'https://api.github.com/users/{user}/gists{{/gist_id}}',
-        'gravatar_id': 'c74f9cfd7776305a82ede0b765d65402',
-        'html_url': 'https://github.com/{user}',
-        'id': 2379650,
-        'login': '{user}',
-        'organizations_url': 'https://api.github.com/users/{user}/orgs',
-        'received_events_url': 'https://api.github.com/users/{user}/received_events',
-        'repos_url': 'https://api.github.com/users/{user}/repos',
-        'site_admin': False,
-        'starred_url': 'https://api.github.com/users/{user}/starred{{/owner}}{{/repo}}',
-        'subscriptions_url': 'https://api.github.com/users/{'
-                             'user}/subscriptions',
-        'type': 'User',
-        'url': 'https://api.github.com/users/{user}'
-    }
-
-    repo_commit = {
-        'ETag': '',
-        'Last-Modified': '',
-        'url': '',
-        'author': repo_author,
-        'committer': {'name': '{user}', 'email': '{user}@osf.io',
-                      'username': 'tester'},
-        'message': 'Fixed error',
-        'tree': {'url': 'https://docs.github.com/en/rest/git/trees',
-                 'sha': 'e22d92d5d90bb8f9695e9a5e2e2311a5c1997230'},
-    }
-    repo_parents = [
-        '12345',
-        'https://api.example.com/entities/67890',
-        'another-entity-id'
-    ]
-
     @mock.patch('addons.gitlab.api.GitLabClient.branches')
     def test_link_repo_registration(self, mock_branches):
         session = GitHubSession()
@@ -569,14 +569,14 @@ def test_link_repo_registration(self, mock_branches):
                 'name': 'master',
                 'commit': {
                     'sha': '444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'url': f'https://api.github.com/repos/{self.user}/mock-repo/commits'
+                    'url': f'https://api.github.com/repos/{USER}/mock-repo/commits'
                            f'/444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'author': self.repo_author,
+                    'author': REPO_AUTHOR,
                     'comments_url': 'https://api.github.com/repos/{user}/mock-repo/comments{{/number}}',
-                    'commit': self.repo_commit,
-                    'committer': self.repo_author,
+                    'commit': REPO_COMMIT,
+                    'committer': REPO_AUTHOR,
                     'html_url': 'https://github.com/{user}',
-                    'parents': self.repo_parents,
+                    'parents': REPO_PARENTS,
 
                 }, '_links': [{
                     'rel': 'self',
@@ -590,14 +590,14 @@ def test_link_repo_registration(self, mock_branches):
                 'name': 'develop',
                 'commit': {
                     'sha': '444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'url': f'https://api.github.com/repos/{self.user}/mock-repo/commits'
+                    'url': f'https://api.github.com/repos/{USER}/mock-repo/commits'
                            f'/444a74d0d90a4aea744dacb31a14f87b5c30759c',
-                    'author': self.repo_author,
+                    'author': REPO_AUTHOR,
                     'comments_url': 'https://api.github.com/repos/{user}/mock-repo/comments{{/number}}',
-                    'commit': self.repo_commit,
-                    'committer': self.repo_author,
+                    'commit': REPO_COMMIT,
+                    'committer': REPO_AUTHOR,
                     'html_url': 'https://github.com/{user}',
-                    'parents': self.repo_parents,
+                    'parents': REPO_PARENTS,
 
                 }, '_links': [{
                     'rel': 'self',
@@ -612,7 +612,7 @@ def test_link_repo_registration(self, mock_branches):
         registration = self.project.register_node(
             schema=get_default_metaschema(),
             auth=self.consolidated_auth,
-             draft_registration=DraftRegistrationFactory(branched_from=self.project)
+            draft_registration=DraftRegistrationFactory(branched_from=self.project)
         )
 
         url = registration.api_url + 'gitlab/settings/'