Making coverage pass in core tox environment.

dhermes · dhermes · commit ed2dc92eaf2e · 2016-09-23T09:18:59.000-07:00
This was necessary because some lines were only tested transitively
in the umbrella package, rather than directly by the core tests.
diff --git a/core/unit_tests/streaming/test_buffered_stream.py b/core/unit_tests/streaming/test_buffered_stream.py
@@ -24,6 +24,20 @@ def _getTargetClass(self):
     def _makeOne(self, *args, **kw):
         return self._getTargetClass()(*args, **kw)
 
+    def test_ctor_closed_stream(self):
+        class _Stream(object):
+            closed = True
+
+        start = 0
+        bufsize = 4
+        bufstream = self._makeOne(_Stream, start, bufsize)
+        self.assertIs(bufstream._stream, _Stream)
+        self.assertEqual(bufstream._start_pos, start)
+        self.assertEqual(bufstream._buffer_pos, 0)
+        self.assertEqual(bufstream._buffered_data, b'')
+        self.assertTrue(bufstream._stream_at_end)
+        self.assertEqual(bufstream._end_pos, 0)
+
     def test_ctor_start_zero_longer_than_buffer(self):
         from io import BytesIO
         CONTENT = b'CONTENT GOES HERE'
diff --git a/core/unit_tests/test_connection.py b/core/unit_tests/test_connection.py
@@ -74,6 +74,37 @@ def test_user_agent_format(self):
         conn = self._makeOne()
         self.assertEqual(conn.USER_AGENT, expected_ua)
 
+    def test__create_scoped_credentials_with_scoped_credentials(self):
+        klass = self._getTargetClass()
+        scoped_creds = object()
+        scope = 'google-specific-scope'
+        credentials = _Credentials(scoped=scoped_creds)
+
+        result = klass._create_scoped_credentials(credentials, scope)
+        self.assertIs(result, scoped_creds)
+        self.assertEqual(credentials._create_scoped_calls, 1)
+        self.assertEqual(credentials._scopes, [scope])
+
+    def test__create_scoped_credentials_without_scope_required(self):
+        klass = self._getTargetClass()
+        credentials = _Credentials()
+
+        result = klass._create_scoped_credentials(credentials, None)
+        self.assertIs(result, credentials)
+        self.assertEqual(credentials._create_scoped_calls, 1)
+        self.assertEqual(credentials._scopes, [])
+
+    def test__create_scoped_credentials_non_scoped_credentials(self):
+        klass = self._getTargetClass()
+        credentials = object()
+        result = klass._create_scoped_credentials(credentials, None)
+        self.assertIs(result, credentials)
+
+    def test__create_scoped_credentials_no_credentials(self):
+        klass = self._getTargetClass()
+        result = klass._create_scoped_credentials(None, None)
+        self.assertIsNone(result)
+
 
 class TestJSONConnection(unittest.TestCase):
 
@@ -375,16 +406,21 @@ def request(self, **kw):
 
 class _Credentials(object):
 
-    _scopes = None
-
-    def __init__(self, authorized=None):
+    def __init__(self, authorized=None, scoped=None):
         self._authorized = authorized
+        self._scoped = scoped
+        self._scoped_required = scoped is not None
         self._create_scoped_calls = 0
+        self._scopes = []
 
     def authorize(self, http):
         self._called_with = http
         return self._authorized
 
     def create_scoped_required(self):
         self._create_scoped_calls += 1
-        return False
+        return self._scoped_required
+
+    def create_scoped(self, scope):
+        self._scopes.append(scope)
+        return self._scoped
diff --git a/core/unit_tests/test_exceptions.py b/core/unit_tests/test_exceptions.py
@@ -125,6 +125,17 @@ def test_html_when_json_expected(self):
         self.assertEqual(exception.message, content)
         self.assertEqual(list(exception.errors), [])
 
+    def test_without_use_json(self):
+        from google.cloud.exceptions import TooManyRequests
+
+        content = u'error-content'
+        response = _Response(TooManyRequests.code)
+        exception = self._callFUT(response, content, use_json=False)
+
+        self.assertIsInstance(exception, TooManyRequests)
+        self.assertEqual(exception.message, content)
+        self.assertEqual(list(exception.errors), [])
+
 
 class _Response(object):
     def __init__(self, status):
