diff options
Diffstat (limited to 'tests/test_clientsecrets.py')
| -rw-r--r-- | tests/test_clientsecrets.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/test_clientsecrets.py b/tests/test_clientsecrets.py index 42eb8c7..3fa9c30 100644 --- a/tests/test_clientsecrets.py +++ b/tests/test_clientsecrets.py @@ -18,17 +18,13 @@ import errno from io import StringIO import os import tempfile - -import unittest2 +import unittest import oauth2client from oauth2client import _helpers from oauth2client import clientsecrets -__author__ = 'jcgregorio@google.com (Joe Gregorio)' - - DATA_DIR = os.path.join(os.path.dirname(__file__), 'data') VALID_FILE = os.path.join(DATA_DIR, 'client_secrets.json') INVALID_FILE = os.path.join(DATA_DIR, 'unfilled_client_secrets.json') @@ -36,7 +32,7 @@ NONEXISTENT_FILE = os.path.join( os.path.dirname(__file__), 'afilethatisntthere.json') -class Test__validate_clientsecrets(unittest2.TestCase): +class Test__validate_clientsecrets(unittest.TestCase): def test_with_none(self): with self.assertRaises(clientsecrets.InvalidClientSecretsError): @@ -147,7 +143,7 @@ class Test__validate_clientsecrets(unittest2.TestCase): self.assertEqual(result, (clientsecrets.TYPE_INSTALLED, client_info)) -class Test__loadfile(unittest2.TestCase): +class Test__loadfile(unittest.TestCase): def test_success(self): client_type, client_info = clientsecrets._loadfile(VALID_FILE) @@ -176,7 +172,7 @@ class Test__loadfile(unittest2.TestCase): clientsecrets._loadfile(filename) -class OAuth2CredentialsTests(unittest2.TestCase): +class OAuth2CredentialsTests(unittest.TestCase): def test_validate_error(self): payload = ( @@ -223,7 +219,7 @@ class OAuth2CredentialsTests(unittest2.TestCase): self.assertEquals(exc_manager.exception.args[3], errno.ENOENT) -class CachedClientsecretsTests(unittest2.TestCase): +class CachedClientsecretsTests(unittest.TestCase): class CacheMock(object): def __init__(self): |