Merge pull request #10 from rsaksham-dev/main_pr_2

Main pr 2

Author: rsaksham

noxfile.py

@@ -111,6 +111,7 @@ def system(session):
     """Run the system test suite."""
     system_test_path = os.path.join("tests", "system.py")
     system_test_folder_path = os.path.join("tests", "system")
+    rerun_count = 0
 
     # Check the value of `RUN_SYSTEM_TESTS` env var. It defaults to true.
     if os.environ.get("RUN_SYSTEM_TESTS", "true") == "false":
@@ -121,6 +122,12 @@ def system(session):
     # mTLS tests requires pyopenssl.
     if os.environ.get("GOOGLE_API_USE_CLIENT_CERTIFICATE", "") == "true":
         session.install("pyopenssl")
+    # Check if endpoint is being overriden for rerun_count
+    if (
+        os.getenv("API_ENDPOINT_OVERRIDE", "https://storage.googleapis.com")
+        != "https://storage.googleapis.com"
+    ):
+        rerun_count = 3
 
     system_test_exists = os.path.exists(system_test_path)
     system_test_folder_exists = os.path.exists(system_test_folder_path)
@@ -152,13 +159,17 @@ def system(session):
     # Run py.test against the system tests.
     if system_test_exists:
         session.run(
-            "py.test", "--quiet", "--reruns=2", system_test_path, *session.posargs
+            "py.test",
+            "--quiet",
+            "--reruns={}".format(rerun_count),
+            system_test_path,
+            *session.posargs,
         )
     if system_test_folder_exists:
         session.run(
             "py.test",
             "--quiet",
-            "--reruns=2",
+            "--reruns={}".format(rerun_count),
             system_test_folder_path,
             *session.posargs,
         )

tests/system/test_bucket.py

@@ -123,7 +123,10 @@ def test_bucket_lifecycle_rules(storage_client, buckets_to_delete):
     assert list(bucket.lifecycle_rules) == []
 
 
-@pytest.mark.flaky(rerun_filter=_helpers.is_api_endpoint_override, reruns=4)
+@pytest.mark.skipif(
+    _helpers.is_api_endpoint_override,
+    reason="Test does not yet support endpoint override",
+)
 def test_bucket_update_labels(storage_client, buckets_to_delete):
     bucket_name = _helpers.unique_name("update-labels")
     bucket = _helpers.retry_429_503(storage_client.create_bucket)(bucket_name)
@@ -618,7 +621,6 @@ def test_bucket_list_blobs_hierarchy_w_include_trailing_delimiter(
     assert iterator.prefixes == expected_prefixes
 
 
-@pytest.mark.flaky(rerun_filter=_helpers.is_api_endpoint_override, reruns=4)
 def test_bucket_w_retention_period(
     storage_client,
     buckets_to_delete,
@@ -798,7 +800,10 @@ def test_bucket_lock_retention_policy(
         bucket.patch()
 
 
-@pytest.mark.flaky(rerun_filter=_helpers.is_api_endpoint_override, reruns=4)
+@pytest.mark.skipif(
+    _helpers.is_api_endpoint_override,
+    reason="Test does not yet support endpoint override",
+)
 def test_new_bucket_w_ubla(
     storage_client,
     buckets_to_delete,