Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
5cb955a
Merge pull request #1 from googleapis/main
rsaksham Sep 26, 2022
e8ea112
Merge pull request #3 from googleapis/main
rsaksham Oct 7, 2022
4cc4b23
Update build.sh
rsaksham Oct 7, 2022
a951397
Update test__signing.py
rsaksham Oct 7, 2022
b8975c1
Update test_blob.py
rsaksham Oct 7, 2022
c92c403
Update test_bucket.py
rsaksham Oct 7, 2022
c56d6f6
Update test_client.py
rsaksham Oct 7, 2022
4d23e79
Update _http.py
rsaksham Oct 7, 2022
2e0708c
Update blob.py
rsaksham Oct 7, 2022
f6a27aa
Update test__signing.py
rsaksham Oct 12, 2022
4d519c7
Update test_client.py
rsaksham Oct 12, 2022
cb5b7c5
Update build.sh
rsaksham Oct 12, 2022
0034711
Update test_client.py
rsaksham Oct 12, 2022
351bdd9
Update test__signing.py
rsaksham Oct 12, 2022
6c66e31
Update test_client.py
rsaksham Oct 12, 2022
b092699
Merge pull request #4 from rsaksham-dev/main_pr_2
rsaksham Oct 12, 2022
144dca1
Update client.py
rsaksham Oct 12, 2022
3d70843
Update client.py
rsaksham Oct 12, 2022
2ee4683
Update test__signing.py
rsaksham Oct 12, 2022
84c7b37
Update test__signing.py
rsaksham Oct 12, 2022
78b3691
Update client.py
rsaksham Oct 12, 2022
7535f52
Update test__signing.py
rsaksham Oct 12, 2022
952f096
Merge pull request #5 from rsaksham-dev/main_pr_2
rsaksham Oct 12, 2022
6a086a7
Merge branch 'main' into main_pr
rsaksham Oct 13, 2022
fdbb9ae
Merge pull request #6 from googleapis/main
rsaksham Oct 14, 2022
0ba25a8
Update client.py
rsaksham Oct 14, 2022
401977f
Update test_client.py
rsaksham Oct 14, 2022
ab47f9d
Update client.py
rsaksham Oct 14, 2022
837a8b3
Update _helpers.py
rsaksham Oct 14, 2022
5ae271f
Update _http.py
rsaksham Oct 14, 2022
c02516e
Update blob.py
rsaksham Oct 14, 2022
f446903
Update _helpers.py
rsaksham Oct 14, 2022
28db45d
Update _helpers.py
rsaksham Oct 14, 2022
c1ccd03
Update test__signing.py
rsaksham Oct 14, 2022
9d442c9
Update test_blob.py
rsaksham Oct 14, 2022
c596b78
Update test__signing.py
rsaksham Oct 14, 2022
03f22e8
Update test_bucket.py
rsaksham Oct 14, 2022
59fdc67
Update test_client.py
rsaksham Oct 14, 2022
202bfe3
Update test__signing.py
rsaksham Oct 14, 2022
f80315d
Update _helpers.py
rsaksham Oct 14, 2022
af4b2ef
Update test__signing.py
rsaksham Oct 14, 2022
dd7f705
Update _helpers.py
rsaksham Oct 14, 2022
680183a
Update test_client.py
rsaksham Oct 14, 2022
33cf5fe
Update test__signing.py
rsaksham Oct 14, 2022
8eca900
Update test_bucket.py
rsaksham Oct 14, 2022
617ff0d
Update test_blob.py
rsaksham Oct 14, 2022
5e219ed
Merge pull request #7 from rsaksham-dev/main_pr_2
rsaksham Oct 14, 2022
e379126
Update _http.py
rsaksham Oct 14, 2022
6faf1d0
Update _http.py
rsaksham Oct 14, 2022
e39b996
Merge branch 'main' into main_pr
rsaksham Oct 15, 2022
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
52f6860
Merge pull request #8 from rsaksham-dev/main_pr_2
rsaksham Oct 16, 2022
a096421
Update noxfile.py
rsaksham Oct 16, 2022
b080445
Update noxfile.py
rsaksham Oct 16, 2022
2c14608
Update noxfile.py
rsaksham Oct 17, 2022
2c8079c
Update test_blob.py
rsaksham Oct 17, 2022
bcd70a8
Update test_bucket.py
rsaksham Oct 17, 2022
3e17368
Merge pull request #9 from rsaksham-dev/main_pr_2
rsaksham Oct 17, 2022
cbe32b5
Update test_bucket.py
rsaksham Oct 17, 2022
ef2ce15
Update noxfile.py
rsaksham Oct 17, 2022
6de9e72
Update noxfile.py
rsaksham Oct 17, 2022
c65ef78
Update test_bucket.py
rsaksham Oct 17, 2022
9949011
Update test_bucket.py
rsaksham Oct 17, 2022
4e74c47
Update noxfile.py
rsaksham Oct 17, 2022
2796e1b
Merge pull request #10 from rsaksham-dev/main_pr_2
rsaksham Oct 17, 2022
f6d3bff
Merge pull request #11 from googleapis/main
rsaksham Oct 20, 2022
15623c4
Merge pull request #12 from googleapis/main
rsaksham Oct 20, 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
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