diff options
| author | Pat Ferate <pferate@users.noreply.github.com> | 2016-07-06 12:45:49 -0700 |
|---|---|---|
| committer | Jon Wayne Parrott <jonwayne@google.com> | 2016-07-06 12:45:49 -0700 |
| commit | f25b7abfafb8610b8434b023cc0a77eb8f4c0b67 (patch) | |
| tree | 69ad92ae6aeabe0f09c45401035cb4f80cf0b68a /tests/test_service_account.py | |
| parent | 267bbc59caad625b3905eec29c040f61aab3b4f0 (diff) | |
| download | oauth2client-f25b7abfafb8610b8434b023cc0a77eb8f4c0b67.tar.gz | |
Use context manager for assertRaises (#537)
* Use context manager for assertRaises, fixes #536.
* Update usage of unittest to unittest2.
* Remove unneeded `if __name__ == '__main__':` clauses in test files.
Diffstat (limited to 'tests/test_service_account.py')
| -rw-r--r-- | tests/test_service_account.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/test_service_account.py b/tests/test_service_account.py index fe9b795..9c7f444 100644 --- a/tests/test_service_account.py +++ b/tests/test_service_account.py @@ -87,11 +87,10 @@ class ServiceAccountCredentialsTests(unittest2.TestCase): self.assertTrue(rsa.pkcs1.verify(b'Google', signature, pub_key)) - self.assertRaises(rsa.pkcs1.VerificationError, - rsa.pkcs1.verify, b'Orest', signature, pub_key) - self.assertRaises(rsa.pkcs1.VerificationError, - rsa.pkcs1.verify, - b'Google', b'bad signature', pub_key) + with self.assertRaises(rsa.pkcs1.VerificationError): + rsa.pkcs1.verify(b'Orest', signature, pub_key) + with self.assertRaises(rsa.pkcs1.VerificationError): + rsa.pkcs1.verify(b'Google', b'bad signature', pub_key) def test_service_account_email(self): self.assertEqual(self.service_account_email, @@ -582,6 +581,3 @@ class JWTAccessCredentialsTests(unittest2.TestCase): token_2 = self.jwt.access_token self.assertEquals(self.jwt.token_expiry, T2_EXPIRY_DATE) self.assertNotEqual(token_1, token_2) - -if __name__ == '__main__': # pragma: NO COVER - unittest2.main() |