diff --git a/tests/Organization.py b/tests/Organization.py index 8865d757be..2255f57d3a 100644 --- a/tests/Organization.py +++ b/tests/Organization.py @@ -580,26 +580,26 @@ def testCreateActionsSecret(self, encrypt): @mock.patch("github.PublicKey.encrypt") def testCreateDependabotSecret(self, encrypt): - self.org = self.g.get_organization("demoorg") + org = self.g.get_organization("demoorg") # encrypt returns a non-deterministic value, we need to mock it so the replay data matches encrypt.return_value = "M+5Fm/BqTfB90h3nC7F3BoZuu3nXs+/KtpXwxm9gG211tbRo0F5UiN0OIfYT83CKcx9oKES9Va4E96/b" - secret = self.org.create_secret("secret_name", "secret-value", secret_type="dependabot", visibility="all") + secret = org.create_secret("secret_name", "secret-value", secret_type="dependabot", visibility="all") self.assertIsNotNone(secret) def testOrgGetSecretAssertion(self): - self.org = self.g.get_organization("demoorg") + org = self.g.get_organization("demoorg") try: - self.org.get_secret(secret_name="splat", secret_type="supersecret") + org.get_secret(secret_name="splat", secret_type="supersecret") except AssertionError: assert True @mock.patch("github.PublicKey.encrypt") def testCreateDependabotSecretSelected(self, encrypt): - self.org = self.g.get_organization("demoorg") - repos = [self.org.get_repo("demo-repo-1"), self.org.get_repo("demo-repo-2")] + org = self.g.get_organization("demoorg") + repos = [org.get_repo("demo-repo-1"), org.get_repo("demo-repo-2")] # encrypt returns a non-deterministic value, we need to mock it so the replay data matches encrypt.return_value = "M+5Fm/BqTfB90h3nC7F3BoZuu3nXs+/KtpXwxm9gG211tbRo0F5UiN0OIfYT83CKcx9oKES9Va4E96/b" - secret = self.org.create_secret( + secret = org.create_secret( secret_name="SECRET_DEP_NAME", unencrypted_value="secret-value", visibility="selected", @@ -613,11 +613,11 @@ def testCreateDependabotSecretSelected(self, encrypt): @mock.patch("github.PublicKey.encrypt") def testOrgSecretEdit(self, encrypt): - self.org = self.g.get_organization("demoorg") - repos = [self.org.get_repo("demo-repo-1"), self.org.get_repo("demo-repo-2")] + org = self.g.get_organization("demoorg") + repos = [org.get_repo("demo-repo-1"), org.get_repo("demo-repo-2")] # encrypt returns a non-deterministic value, we need to mock it so the replay data matches encrypt.return_value = "M+5Fm/BqTfB90h3nC7F3BoZuu3nXs+/KtpXwxm9gG211tbRo0F5UiN0OIfYT83CKcx9oKES9Va4E96/b" - secret = self.org.create_secret( + secret = org.create_secret( secret_name="secret_act_name", unencrypted_value="secret-value", visibility="selected", diff --git a/tests/ReplayData/Organization.testCreateSecret.txt b/tests/ReplayData/Organization.testCreateSecret.txt deleted file mode 100644 index be828cceaf..0000000000 --- a/tests/ReplayData/Organization.testCreateSecret.txt +++ /dev/null @@ -1,21 +0,0 @@ -https -GET -api.github.com -None -/orgs/BeaverSoftware/actions/secrets/public-key -{'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python'} -None -200 -[('status', '200 OK'), ('x-ratelimit-remaining', '4978'), ('content-length', '487'), ('server', 'nginx/1.0.13'), ('connection', 'keep-alive'), ('x-ratelimit-limit', '5000'), ('etag', '"1dd282b50e691f8f162ef9355dad8771"'), ('date', 'Thu, 10 May 2012 19:03:19 GMT'), ('content-type', 'application/json; charset=utf-8')] -{"key": "u5e1Z25+z8pmgVVt5Pd8k0z/sKpVL1MXYtRAecE4vm8=", "key_id": "568250167242549743"} - -https -PUT -api.github.com -None -/orgs/BeaverSoftware/actions/secrets/secret-name -{'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python', 'Content-Type': 'application/json'} -{"encrypted_value": "M+5Fm/BqTfB90h3nC7F3BoZuu3nXs+/KtpXwxm9gG211tbRo0F5UiN0OIfYT83CKcx9oKES9Va4E96/b", "key_id": "568250167242549743", "visibility": "all"} -201 -[('Date', 'Fri, 17 Apr 2020 00:12:33 GMT'), ('Server', 'GitHub.com'), ('Content-Length', '2'), ('Content-Type', 'application/json; charset=utf-8'), ('Status', '201 Created'), ('X-RateLimit-Limit', '5000'), ('X-RateLimit-Remaining', '4984'), ('X-RateLimit-Reset', '1587085388'), ('X-OAuth-Scopes', 'read:org, repo, user'), ('X-Accepted-OAuth-Scopes', ''), ('X-GitHub-Media-Type', 'github.v3; format=json'), ('Access-Control-Expose-Headers', 'ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset'), ('Access-Control-Allow-Origin', '*'), ('Strict-Transport-Security', 'max-age=31536000; includeSubdomains; preload'), ('X-Frame-Options', 'deny'), ('X-Content-Type-Options', 'nosniff'), ('X-XSS-Protection', '1; mode=block'), ('Referrer-Policy', 'origin-when-cross-origin, strict-origin-when-cross-origin'), ('Content-Security-Policy', "default-src 'none'"), ('Vary', 'Accept-Encoding, Accept, X-Requested-With'), ('X-GitHub-Request-Id', 'C290:52DA:50234:B404B:5E98F470')] -{} diff --git a/tests/ReplayData/Repository.testCreateSecret.txt b/tests/ReplayData/Repository.testCreateSecret.txt deleted file mode 100644 index 91169b37bd..0000000000 --- a/tests/ReplayData/Repository.testCreateSecret.txt +++ /dev/null @@ -1,21 +0,0 @@ -https -GET -api.github.com -None -/repos/jacquev6/PyGithub/actions/secrets/public-key -{'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python'} -None -200 -[('status', '200 OK'), ('x-ratelimit-remaining', '4978'), ('content-length', '487'), ('server', 'nginx/1.0.13'), ('connection', 'keep-alive'), ('x-ratelimit-limit', '5000'), ('etag', '"1dd282b50e691f8f162ef9355dad8771"'), ('date', 'Thu, 10 May 2012 19:03:19 GMT'), ('content-type', 'application/json; charset=utf-8')] -{"key": "u5e1Z25+z8pmgVVt5Pd8k0z/sKpVL1MXYtRAecE4vm8=", "key_id": "568250167242549743"} - -https -PUT -api.github.com -None -/repos/jacquev6/PyGithub/actions/secrets/secret-name -{'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python', 'Content-Type': 'application/json'} -{"encrypted_value": "M+5Fm/BqTfB90h3nC7F3BoZuu3nXs+/KtpXwxm9gG211tbRo0F5UiN0OIfYT83CKcx9oKES9Va4E96/b", "key_id": "568250167242549743"} -201 -[('Date', 'Fri, 17 Apr 2020 00:12:33 GMT'), ('Server', 'GitHub.com'), ('Content-Length', '2'), ('Content-Type', 'application/json; charset=utf-8'), ('Status', '201 Created'), ('X-RateLimit-Limit', '5000'), ('X-RateLimit-Remaining', '4984'), ('X-RateLimit-Reset', '1587085388'), ('X-OAuth-Scopes', 'read:org, repo, user'), ('X-Accepted-OAuth-Scopes', ''), ('X-GitHub-Media-Type', 'github.v3; format=json'), ('Access-Control-Expose-Headers', 'ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset'), ('Access-Control-Allow-Origin', '*'), ('Strict-Transport-Security', 'max-age=31536000; includeSubdomains; preload'), ('X-Frame-Options', 'deny'), ('X-Content-Type-Options', 'nosniff'), ('X-XSS-Protection', '1; mode=block'), ('Referrer-Policy', 'origin-when-cross-origin, strict-origin-when-cross-origin'), ('Content-Security-Policy', "default-src 'none'"), ('Vary', 'Accept-Encoding, Accept, X-Requested-With'), ('X-GitHub-Request-Id', 'C290:52DA:50234:B404B:5E98F470')] -{}