fix s3 delete_many #38
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Couldn't find any documentation around this issue, but I empirically discovered that `delete_objects` with an empty array causes the request to fail. Also, this is a valid optimization anyway.
|
Add a quick test. |
taion
reviewed
Jul 14, 2017
tests/test_s3.py
Outdated
| def assert_not_called(*args, **kwargs): | ||
| assert(False) | ||
|
|
||
| monkeypatch.setattr(annex._client, 'delete_objects', assert_not_called) |
There was a problem hiding this comment.
why not just use a mock and actually assert it's not called, instead of this thing?
There was a problem hiding this comment.
because I didn't think it was worth adding a dependency
There was a problem hiding this comment.
what dependency? isn't mock in python3?
There was a problem hiding this comment.
yes but tests run also on py2
There was a problem hiding this comment.
I think adding that dev dep is fine/better
flask_annex/s3.py
Outdated
| @@ -40,11 +40,15 @@ def delete(self, key): | |||
| self._client.delete_object(Bucket=self._bucket_name, Key=key) | |||
|
|
|||
| def delete_many(self, keys): | |||
| objects = tuple({'Key': key} for key in keys) | |||
There was a problem hiding this comment.
probably worth noting that you're doing this first because keys may be an iterable
taion
approved these changes
Jul 14, 2017
tests/test_s3.py
Outdated
| @@ -12,6 +12,7 @@ | |||
|
|
|||
| try: | |||
| import boto3 | |||
| from mock import Mock | |||
There was a problem hiding this comment.
install this unconditionally and take this out of the try/catch imo
taion
approved these changes
Jul 14, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Couldn't find any documentation around this issue, but I empirically discovered that
delete_objectswith an empty array causes the request to fail. Also, this is a valid optimization anyway.