Skip to content

Commit

Permalink
Merge pull request #260 from dandi/fixes
Browse files Browse the repository at this point in the history
Fix failing tests
  • Loading branch information
jwodder authored Nov 4, 2020
2 parents bffa737 + 41d8b05 commit f424a31
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Moved code for navigating Dandi Archive into new `dandiarchive` submodule
- YAML output now sorts keys
- `dandiset.yaml` is no longer uploaded to the archive
- Restrict h5py dependency to pre-v3.0

## [0.6.4] - 2020-09-04

Expand Down
26 changes: 22 additions & 4 deletions dandi/tests/test_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ def sleep(duration):
@pytest.mark.parametrize(
"url",
[ # Should go through API
"https://dandiarchive.org/dandiset/000027/0.200721.2222",
pytest.param(
"https://dandiarchive.org/dandiset/000027/0.200721.2222",
marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"),
),
# Drafts do not go through API ATM, but that should not be visible to user
"https://dandiarchive.org/dandiset/000027/draft",
],
Expand Down Expand Up @@ -107,7 +110,10 @@ def test_download_000027(url, tmpdir):
@pytest.mark.parametrize(
"url",
[ # Should go through API
"https://dandiarchive.org/dandiset/000027/0.200721.2222",
pytest.param(
"https://dandiarchive.org/dandiset/000027/0.200721.2222",
marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"),
),
# Drafts do not go through API ATM, but that should not be visible to user
"https://dandiarchive.org/dandiset/000027/draft",
],
Expand All @@ -123,7 +129,10 @@ def test_download_000027_metadata_only(url, tmpdir):
@pytest.mark.parametrize(
"url",
[ # Should go through API
"https://dandiarchive.org/dandiset/000027/0.200721.2222",
pytest.param(
"https://dandiarchive.org/dandiset/000027/0.200721.2222",
marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"),
),
# Drafts do not go through API ATM, but that should not be visible to user
"https://dandiarchive.org/dandiset/000027/draft",
],
Expand All @@ -148,7 +157,16 @@ def raise_assertion_error(*args, **kwargs):


@pytest.mark.parametrize("resizer", [lambda sz: 0, lambda sz: sz // 2, lambda sz: sz])
@pytest.mark.parametrize("version", ["0.200721.2222", "draft"])
@pytest.mark.parametrize(
"version",
[
pytest.param(
"0.200721.2222",
marks=pytest.mark.xfail(reason="publish.dandiarchive.org is gone"),
),
"draft",
],
)
def test_download_000027_resume(tmp_path, resizer, version):
from ..support.digests import Digester

Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ install_requires =
email-validator
etelemetry >= 0.2.0
fasteners
h5py ~= 2.9
joblib
pydantic
pyout != 0.6.0
Expand Down

0 comments on commit f424a31

Please sign in to comment.