From 4820062d853ae0b42574c69f3472bfabebed09cf Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Fri, 11 Nov 2016 16:06:42 -0800
Subject: [PATCH] Get storage system tests to pass

---
 core/google/cloud/streaming/http_wrapper.py | 2 +-
 system_tests/attempt_system_tests.py        | 2 +-
 system_tests/system_test_utils.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/google/cloud/streaming/http_wrapper.py b/core/google/cloud/streaming/http_wrapper.py
index 3f8d8355645d3..f36713ad266ed 100644
--- 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
index c6e7297a5fa0c..94546dca032eb 100644
--- 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
index 393bd4b5df8b7..56e8a92032929 100644
--- 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.