Merge pull request #4 from rsaksham-dev/main_pr_2

Main pr 2

Author: rsaksham

.kokoro/build.sh

@@ -39,6 +39,10 @@ export API_ENDPOINT_OVERRIDE
 # Export variable to override api endpoint version
 export API_VERSION_OVERRIDE
 
+# Export dual region locations
+export DUAL_REGION_LOC_1
+export DUAL_REGION_LOC_2
+
 # Remove old nox
 python3 -m pip uninstall --yes --quiet nox-automation
 

tests/system/test__signing.py

@@ -25,6 +25,10 @@
 from google.cloud import iam_credentials_v1
 from . import _helpers
 
+API_ACCESS_ENDPOINT = os.getenv(
+    "API_ENDPOINT_OVERRIDE", "https://storage.googleapis.com"
+)
+
 
 def _morph_expiration(version, expiration):
     if expiration is not None:
@@ -42,17 +46,17 @@ def _create_signed_list_blobs_url_helper(
     expiration = _morph_expiration(version, expiration)
 
     signed_url = bucket.generate_signed_url(
-        expiration=expiration, method=method, client=client, version=version
+        expiration=expiration,
+        method=method,
+        client=client,
+        version=version,
+        api_access_endpoint=API_ACCESS_ENDPOINT,
     )
 
     response = requests.get(signed_url)
     assert response.status_code == 200
 
 
-@pytest.mark.skipif(
-    "API_ENDPOINT_OVERRIDE" in os.environ,
-    reason="Failing test for the overriding endpoint",
-)
 def test_create_signed_list_blobs_url_v2(storage_client, signing_bucket, no_mtls):
     _create_signed_list_blobs_url_helper(
         storage_client,
@@ -61,10 +65,6 @@ def test_create_signed_list_blobs_url_v2(storage_client, signing_bucket, no_mtls
     )
 
 
-@pytest.mark.skipif(
-    "API_ENDPOINT_OVERRIDE" in os.environ,
-    reason="Failing test for the overriding endpoint",
-)
 def test_create_signed_list_blobs_url_v2_w_expiration(
     storage_client, signing_bucket, no_mtls
 ):
@@ -79,10 +79,6 @@ def test_create_signed_list_blobs_url_v2_w_expiration(
     )
 
 
-@pytest.mark.skipif(
-    "API_ENDPOINT_OVERRIDE" in os.environ,
-    reason="Failing test for the overriding endpoint",
-)
 def test_create_signed_list_blobs_url_v4(storage_client, signing_bucket, no_mtls):
     _create_signed_list_blobs_url_helper(
         storage_client,
@@ -91,10 +87,6 @@ def test_create_signed_list_blobs_url_v4(storage_client, signing_bucket, no_mtls
     )
 
 
-@pytest.mark.skipif(
-    "API_ENDPOINT_OVERRIDE" in os.environ,
-    reason="Failing test for the overriding endpoint",
-)
 def test_create_signed_list_blobs_url_v4_w_expiration(
     storage_client, signing_bucket, no_mtls
 ):

tests/system/test_client.py

@@ -73,16 +73,15 @@ def test_create_bucket_simple(storage_client, buckets_to_delete):
     assert created.name == new_bucket_name
 
 
-@pytest.mark.skipif(
-    "API_ENDPOINT_OVERRIDE" in os.environ,
-    reason="Failing test for the overriding endpoint",
-)
 def test_create_bucket_dual_region(storage_client, buckets_to_delete):
     from google.cloud.storage.constants import DUAL_REGION_LOCATION_TYPE
 
     new_bucket_name = _helpers.unique_name("dual-region-bucket")
     location = "US"
-    data_locations = ["US-EAST1", "US-WEST1"]
+    dual_data_loc_1 = os.getenv("DUAL_REGION_LOC_1", "US-EAST1")
+    dual_data_loc_2 = os.getenv("DUAL_REGION_LOC_2", "US-WEST1")
+
+    data_locations = [dual_data_loc_1, dual_data_loc_2]
 
     with pytest.raises(exceptions.NotFound):
         storage_client.get_bucket(new_bucket_name)