Skip to content

Main pr 2 #8

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.

Sign up for GitHub

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 4 commits into from
Oct 16, 2022
Merged

Main pr 2 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a64332
Update noxfile.py
rsaksham Oct 16, 2022
676f724
Update test_blob.py
rsaksham Oct 16, 2022
3b76069
Update test_bucket.py
rsaksham Oct 16, 2022
515e839
Update test_bucket.py
rsaksham Oct 16, 2022
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
14 changes: 11 additions & 3 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def system(session):
# 2021-05-06: defer installing 'google-cloud-*' to after this package,
# in order to work around Python 2.7 googolapis-common-protos
# issue.
session.install("mock", "pytest", "-c", constraints_path)
session.install("mock", "pytest", "pytest-rerunfailures", "-c", constraints_path)
session.install("-e", ".", "-c", constraints_path)
session.install(
"google-cloud-testutils",
Expand All @@ -151,9 +151,17 @@ def system(session):

# Run py.test against the system tests.
if system_test_exists:
session.run("py.test", "--quiet", system_test_path, *session.posargs)
session.run(
"py.test", "--quiet", "--reruns=7", system_test_path, *session.posargs
)
if system_test_folder_exists:
session.run("py.test", "--quiet", system_test_folder_path, *session.posargs)
session.run(
"py.test",
"--quiet",
"--reruns=7",
system_test_folder_path,
*session.posargs,
)


@nox.session(python=CONFORMANCE_TEST_PYTHON_VERSIONS)
Expand Down
4 changes: 0 additions & 4 deletions tests/system/test_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ 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
12 changes: 0 additions & 12 deletions tests/system/test_bucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,6 @@ 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)
Expand Down Expand Up @@ -621,10 +617,6 @@ def test_bucket_list_blobs_hierarchy_w_include_trailing_delimiter(
assert iterator.prefixes == expected_prefixes


@pytest.mark.skipif(
_helpers.is_api_endpoint_override,
reason="Test does not yet support endpoint override",
)
def test_bucket_w_retention_period(
storage_client,
buckets_to_delete,
Expand Down Expand Up @@ -804,10 +796,6 @@ 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,
Expand Down