Skip to content

Main pr 2 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ def system(session):
# Run py.test against the system tests.
if system_test_exists:
session.run(
"py.test", "--quiet", "--reruns=7", system_test_path, *session.posargs
"py.test", "--quiet", "--reruns=2", system_test_path, *session.posargs
)
if system_test_folder_exists:
session.run(
"py.test",
"--quiet",
"--reruns=7",
"--reruns=2",
system_test_folder_path,
*session.posargs,
)
Expand Down
4 changes: 4 additions & 0 deletions tests/system/test_blob.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ def test_large_file_write_from_stream_w_failed_checksum(
assert not blob.exists()


@pytest.mark.skipif(
_helpers.is_api_endpoint_override,
reason="Test does not yet support endpoint override",
)
def test_large_file_write_from_stream_w_encryption_key(
storage_client,
shared_bucket,
Expand Down
3 changes: 3 additions & 0 deletions tests/system/test_bucket.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ 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)
Expand Down Expand Up @@ -617,6 +618,7 @@ 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,
Expand Down Expand Up @@ -796,6 +798,7 @@ 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,
Expand Down