Allow check_upload assets to use docker #323
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
The docker compose setup as used in pyDataverse uses a different storage backend than demo.dataverse.org, so the storageIdentifier reports a non-s3:// address. This commit detects the two most common ways of specifying localhost (leaving out 127.1 and the like) to allow for `local://` storageIdentifiers. Relates to datalad#320.
adswa
reviewed
Aug 23, 2024
| @@ -140,7 +141,12 @@ def check_upload(api, dsid, fcontent, fpath, src_md5): | |||
| # TODO: seemingly discontinued between Dataverse 5.13 and 6.0? | |||
| #assert df['pidURL'] == '' | |||
| assert df['rootDataFileId'] == -1 | |||
| assert df['storageIdentifier'].startswith('s3://demo-dataverse') | |||
|
|
|||
| dv_url = os.getenv('DATAVERSE_TEST_BASEURL') | |||
There was a problem hiding this comment.
We have a test fixture that provides this if it is defined in the environment, and falls back on the demo instance if not:
datalad-dataverse/datalad_dataverse/tests/fixtures.py
Lines 33 to 37 in 0621e2d
I'll push a change into this PR.
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.
The docker compose setup as used in pyDataverse uses a different storage backend than demo.dataverse.org, so the storageIdentifier reports a non-s3:// address.
This commit detects the two most common ways of specifying localhost (leaving out 127.1 and the like) to allow for
local://storageIdentifiers.Relates to #320.