From cbe32b577f3c7a0ca1898245a84dc87e5e999258 Mon Sep 17 00:00:00 2001 From: rsaksham Date: Mon, 17 Oct 2022 23:09:10 +0530 Subject: [PATCH 1/6] Update test_bucket.py --- tests/system/test_bucket.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/system/test_bucket.py b/tests/system/test_bucket.py index 005b51f7b..a47c1eaf9 100644 --- a/tests/system/test_bucket.py +++ b/tests/system/test_bucket.py @@ -123,7 +123,6 @@ 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) 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 +617,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 +796,6 @@ def test_bucket_lock_retention_policy( bucket.patch() -@pytest.mark.flaky(rerun_filter=_helpers.is_api_endpoint_override, reruns=4) def test_new_bucket_w_ubla( storage_client, buckets_to_delete, From ef2ce155d5c2433a5dd490dbab4583af2a094d2c Mon Sep 17 00:00:00 2001 From: rsaksham Date: Mon, 17 Oct 2022 23:19:55 +0530 Subject: [PATCH 2/6] Update noxfile.py --- noxfile.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/noxfile.py b/noxfile.py index c217cfefa..4835ae92e 100644 --- a/noxfile.py +++ b/noxfile.py @@ -111,7 +111,8 @@ 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": session.skip("RUN_SYSTEM_TESTS is set to false, skipping") @@ -121,7 +122,10 @@ 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=4 + system_test_exists = os.path.exists(system_test_path) system_test_folder_exists = os.path.exists(system_test_folder_path) # Environment check: only run tests if found. @@ -152,13 +156,13 @@ 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, ) From 6de9e726cfc40b27c100ca0c0a6fc994644d086b Mon Sep 17 00:00:00 2001 From: rsaksham Date: Mon, 17 Oct 2022 23:25:05 +0530 Subject: [PATCH 3/6] Update noxfile.py --- noxfile.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/noxfile.py b/noxfile.py index 4835ae92e..f530a9fde 100644 --- a/noxfile.py +++ b/noxfile.py @@ -112,7 +112,7 @@ def system(session): 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": session.skip("RUN_SYSTEM_TESTS is set to false, skipping") @@ -123,9 +123,12 @@ def system(session): 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=4 - + if ( + os.getenv("API_ENDPOINT_OVERRIDE", "https://storage.googleapis.com") + != "https://storage.googleapis.com" + ): + rerun_count = 4 + system_test_exists = os.path.exists(system_test_path) system_test_folder_exists = os.path.exists(system_test_folder_path) # Environment check: only run tests if found. @@ -156,7 +159,11 @@ def system(session): # Run py.test against the system tests. if system_test_exists: session.run( - "py.test", "--quiet", "--reruns={}".format(rerun_count), system_test_path, *session.posargs + "py.test", + "--quiet", + "--reruns={}".format(rerun_count), + system_test_path, + *session.posargs, ) if system_test_folder_exists: session.run( From c65ef78adc0b297f10bb75cf78265a9446edec7f Mon Sep 17 00:00:00 2001 From: rsaksham Date: Mon, 17 Oct 2022 23:45:40 +0530 Subject: [PATCH 4/6] Update test_bucket.py --- tests/system/test_bucket.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/system/test_bucket.py b/tests/system/test_bucket.py index a47c1eaf9..32a70a85e 100644 --- a/tests/system/test_bucket.py +++ b/tests/system/test_bucket.py @@ -123,6 +123,10 @@ def test_bucket_lifecycle_rules(storage_client, buckets_to_delete): assert list(bucket.lifecycle_rules) == [] +@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) From 99490113e484f4919e36b72face391cf7bf71d9c Mon Sep 17 00:00:00 2001 From: rsaksham Date: Mon, 17 Oct 2022 23:53:55 +0530 Subject: [PATCH 5/6] Update test_bucket.py --- tests/system/test_bucket.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/system/test_bucket.py b/tests/system/test_bucket.py index 32a70a85e..4795837f0 100644 --- a/tests/system/test_bucket.py +++ b/tests/system/test_bucket.py @@ -800,6 +800,10 @@ def test_bucket_lock_retention_policy( bucket.patch() +@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, From 4e74c47ac7e0c1d54a67da382bae86a9686cf7c0 Mon Sep 17 00:00:00 2001 From: rsaksham Date: Mon, 17 Oct 2022 23:54:18 +0530 Subject: [PATCH 6/6] Update noxfile.py --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index f530a9fde..3b8eb127b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -127,7 +127,7 @@ def system(session): os.getenv("API_ENDPOINT_OVERRIDE", "https://storage.googleapis.com") != "https://storage.googleapis.com" ): - rerun_count = 4 + rerun_count = 3 system_test_exists = os.path.exists(system_test_path) system_test_folder_exists = os.path.exists(system_test_folder_path)