Get storage system tests to pass

googleapis · Dec 1, 2016 · 46f83da · 46f83da
1 parent 3b908c8
commit 46f83da
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/google/cloud/streaming/http_wrapper.py b/core/google/cloud/streaming/http_wrapper.py
@@ -90,7 +90,7 @@ def _httplib2_debug_level(http_request, level, http=None):
     old_level = httplib2.debuglevel
     http_levels = {}
     httplib2.debuglevel = level
-    if http is not None:
+    if http is not None and hasattr(http, 'connections'):
         for connection_key, connection in http.connections.items():
             # httplib2 stores two kinds of values in this dict, connection
             # classes and instances. Since the connection types are all

diff --git a/system_tests/attempt_system_tests.py b/system_tests/attempt_system_tests.py
@@ -50,7 +50,7 @@
 import subprocess
 import sys
 
-from google.cloud.environment_vars import CREDENTIALS
+from google.auth.environment_vars import CREDENTIALS
 
 from run_system_test import FailedSystemTestModule
 from run_system_test import run_module_tests

diff --git a/system_tests/system_test_utils.py b/system_tests/system_test_utils.py
@@ -17,7 +17,7 @@
 import sys
 import time
 
-from google.cloud.environment_vars import CREDENTIALS as TEST_CREDENTIALS
+from google.auth.environment_vars import CREDENTIALS as TEST_CREDENTIALS
 
 
 # From shell environ. May be None.