check if the universe attribute exists

Author: ohmayr

tests/test_discovery.py

@@ -107,6 +107,9 @@
 
 DATA_DIR = os.path.join(os.path.dirname(__file__), "data")
 
+def _reset_universe_domain(credentials, universe_domain=None):
+    if hasattr(credentials, "universe_domain"):
+        credentials.universe_domain = universe_domain
 
 def assertUrisEqual(testcase, expected, actual):
     """Test that URIs are the same, up to reordering of query parameters."""
@@ -542,7 +545,8 @@ def test_credentials_and_credentials_file_mutually_exclusive(self):
 
 class DiscoveryFromDocument(unittest.TestCase):
     MOCK_CREDENTIALS = mock.Mock(spec=google.auth.credentials.Credentials)
-    MOCK_CREDENTIALS.universe_domain = None
+    _reset_universe_domain(MOCK_CREDENTIALS)
+    
     def test_can_build_from_local_document(self):
         discovery = read_datafile("plus.json")
         plus = build_from_document(
@@ -694,7 +698,7 @@ def test_scopes_from_client_options(self):
         discovery = read_datafile("plus.json")
 
         with mock.patch("googleapiclient._auth.default_credentials") as default:
-            default.return_value.universe_domain = None
+            _reset_universe_domain(default.return_value)
             plus = build_from_document(
                 discovery,
                 client_options={"scopes": ["1", "2"]},
@@ -706,7 +710,7 @@ def test_quota_project_from_client_options(self):
         discovery = read_datafile("plus.json")
 
         with mock.patch("googleapiclient._auth.default_credentials") as default:
-            default.return_value.universe_domain = None
+            _reset_universe_domain(default.return_value)
             plus = build_from_document(
                 discovery,
                 client_options=google.api_core.client_options.ClientOptions(
@@ -720,7 +724,7 @@ def test_credentials_file_from_client_options(self):
         discovery = read_datafile("plus.json")
 
         with mock.patch("googleapiclient._auth.credentials_from_file") as default:
-            default.return_value.universe_domain = None
+            _reset_universe_domain(default.return_value)
             plus = build_from_document(
                 discovery,
                 client_options=google.api_core.client_options.ClientOptions(
@@ -776,7 +780,7 @@ def test_self_signed_jwt_disabled(self):
 
 class DiscoveryFromDocumentMutualTLS(unittest.TestCase):
     MOCK_CREDENTIALS = mock.Mock(spec=google.auth.credentials.Credentials)
-    MOCK_CREDENTIALS.universe_domain = None
+    _reset_universe_domain(MOCK_CREDENTIALS)
     ADC_CERT_PATH = "adc_cert_path"
     ADC_KEY_PATH = "adc_key_path"
     ADC_PASSPHRASE = "adc_passphrase"
@@ -1533,7 +1537,7 @@ def test_plus_resources(self):
     @unittest.skipIf(not HAS_OAUTH2CLIENT, "oauth2client unavailable.")
     def test_oauth2client_credentials(self):
         credentials = mock.Mock(spec=GoogleCredentials)
-        credentials.universe_domain = None
+        _reset_universe_domain(credentials)
         credentials.create_scoped_required.return_value = False
 
         discovery = read_datafile("plus.json")
@@ -1542,7 +1546,7 @@ def test_oauth2client_credentials(self):
 
     def test_google_auth_credentials(self):
         credentials = mock.Mock(spec=google.auth.credentials.Credentials)
-        credentials.universe_domain = None
+        _reset_universe_domain(credentials)
         discovery = read_datafile("plus.json")
         service = build_from_document(discovery, credentials=credentials)
 
@@ -2671,21 +2675,22 @@ def test_universe_env_var_configured_with_client_options_universe(self):
                 )
 
             assert tasks._universe_domain == fake_universe
+    
     else:
-        def test_client_options_universe_with_older_version_of_api_core(self):
-            fake_universe = "foo.com"
-            credentials = mock.Mock(spec=google.auth.credentials.Credentials)
-            credentials.universe_domain = fake_universe
-            discovery = read_datafile("tasks.json")
-            with self.assertRaises(APICoreVersionError):
-                tasks = build_from_document(
-                    discovery,
-                    credentials=credentials,
-                    client_options=google.api_core.client_options.ClientOptions(
-                        universe_domain=fake_universe
-                    ),
-                )
-
+        if hasattr(google.api_core.client_options.ClientOptions, "universe_domain"):
+            def test_client_options_universe_with_older_version_of_api_core(self):
+                fake_universe = "foo.com"
+                credentials = mock.Mock(spec=google.auth.credentials.Credentials)
+                credentials.universe_domain = fake_universe
+                discovery = read_datafile("tasks.json")
+                with self.assertRaises(APICoreVersionError):
+                    tasks = build_from_document(
+                        discovery,
+                        credentials=credentials,
+                        client_options=google.api_core.client_options.ClientOptions(
+                            universe_domain=fake_universe
+                        ),
+                    )
 
         def test_credentials_universe_with_older_version_of_api_core(self):
             fake_universe = "foo.com"