Skip to content

tests: add blobs retention policy discarding into TestRetentionPolicy…#99

Merged
frankyn merged 2 commits intogoogleapis:masterfrom
MaxxleLLC:system_tests_teardown_improve
Apr 3, 2020
Merged

tests: add blobs retention policy discarding into TestRetentionPolicy…#99
frankyn merged 2 commits intogoogleapis:masterfrom
MaxxleLLC:system_tests_teardown_improve

Conversation

@IlyaFaer
Copy link

@IlyaFaer IlyaFaer commented Apr 3, 2020

Closes #97

@IlyaFaer IlyaFaer added api: storage Issues related to the googleapis/python-storage API. testing labels Apr 3, 2020
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Apr 3, 2020
@IlyaFaer
Copy link
Author

IlyaFaer commented Apr 3, 2020

I've tried to avoid as much requests to the service as I could, so here is how it's gonna work:

Every TestRetentionPolicy test uses one blob (or two Blob() objects, but still single blob in database). We can add one of them into list - no matter which (as they are related to the same file). On a teardown we'll just walk through these blobs and discard their policies, and then call bucket.delete(force=True) as usual.

We're adding blob into list after instancing. If test passed, we're calling pop() to delete blob from the list - it's already deleted by the test, so we don't need to take care of it anymore.

@IlyaFaer IlyaFaer added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Apr 3, 2020
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Apr 3, 2020
IlyaFaer
IlyaFaer commented Apr 3, 2020
View reviewed changes
tests/system/test_system.py
self.assertIsNone(other.retention_expiration_time)
self.assertFalse(blob.event_based_hold)
self.assertFalse(blob.temporary_hold)
self.assertIsNone(blob.retention_expiration_time)
Copy link
Author

@IlyaFaer IlyaFaer Apr 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think, there is an error here: other blob is already deleted (line 1806). Most likely, blob was going to be here, as it's just has been uploaded and there is no asserts for it.

Copy link
Contributor

@frankyn frankyn Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

@IlyaFaer IlyaFaer requested review from crwilcox and frankyn April 3, 2020 16:12
@IlyaFaer IlyaFaer marked this pull request as ready for review April 3, 2020 16:13
frankyn
frankyn approved these changes Apr 3, 2020
View reviewed changes
Copy link
Contributor

@frankyn frankyn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @IlyaFaer LGTM

tests/system/test_system.py
self.assertIsNone(other.retention_expiration_time)
self.assertFalse(blob.event_based_hold)
self.assertFalse(blob.temporary_hold)
self.assertIsNone(blob.retention_expiration_time)
Copy link
Contributor

@frankyn frankyn Apr 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

@frankyn frankyn merged commit 5c04eef into googleapis:master Apr 3, 2020
cojenco pushed a commit to cojenco/python-storage that referenced this pull request Oct 13, 2021
@cojenco
tests: add blobs retention policy discarding into TestRetentionPolicy… (
f21f163 
googleapis#99)

* tests: add blobs retention policy discarding into TestRetentionPolicy() teardown

* merging error fix
cojenco pushed a commit to cojenco/python-storage that referenced this pull request Oct 13, 2021
@cojenco
tests: add blobs retention policy discarding into TestRetentionPolicy… (
ad6274a 
googleapis#99)

* tests: add blobs retention policy discarding into TestRetentionPolicy() teardown

* merging error fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crwilcox crwilcox Awaiting requested review from crwilcox

1 more reviewer

@frankyn frankyn frankyn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

api: storage Issues related to the googleapis/python-storage API. cla: yes This human has signed the Contributor License Agreement. testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

TestRetentionPolicy: bucket deletion conflict on teardown

4 participants

@IlyaFaer @frankyn @googlebot @yoshi-kokoro