From: "Horea Christian" <horea.christ@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: dev-vcs/dandi-cli/files/, dev-vcs/dandi-cli/
Date: Thu, 25 May 2023 18:28:41 +0000 (UTC) [thread overview]
Message-ID: <1685039304.aaab8fcd6ed41cbce7f58a0a47f75f49e51b6d21.chymera@gentoo> (raw)
commit: aaab8fcd6ed41cbce7f58a0a47f75f49e51b6d21
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Thu May 25 18:28:24 2023 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Thu May 25 18:28:24 2023 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=aaab8fcd
dev-vcs/dandi-cli: fixed tests
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
dev-vcs/dandi-cli/dandi-cli-0.55.0-r1.ebuild | 6 ++---
dev-vcs/dandi-cli/dandi-cli-0.55.1.ebuild | 6 ++---
.../dandi-cli/files/dandi-cli-0.55.0-hdf5.patch | 29 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.55.0-r1.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.55.0-r1.ebuild
index 6dc1301c4..060424cdb 100644
--- a/dev-vcs/dandi-cli/dandi-cli-0.55.0-r1.ebuild
+++ b/dev-vcs/dandi-cli/dandi-cli-0.55.0-r1.ebuild
@@ -65,10 +65,8 @@ BDEPEND="
S="${WORKDIR}/${MY_P}"
-# Reported upstream:
-# https://github.com/dandi/dandi-cli/issues/1297
-EPYTEST_DESELECT=(
- dandi/tests/test_files.py::test_validate_bogus
+PATCHES=(
+ "${FILESDIR}/${PN}-0.55.0-hdf5.patch"
)
distutils_enable_tests pytest
diff --git a/dev-vcs/dandi-cli/dandi-cli-0.55.1.ebuild b/dev-vcs/dandi-cli/dandi-cli-0.55.1.ebuild
index ad8849482..beb2ffcc7 100644
--- a/dev-vcs/dandi-cli/dandi-cli-0.55.1.ebuild
+++ b/dev-vcs/dandi-cli/dandi-cli-0.55.1.ebuild
@@ -65,10 +65,8 @@ BDEPEND="
S="${WORKDIR}/${MY_P}"
-# Reported upstream:
-# https://github.com/dandi/dandi-cli/issues/1297
-EPYTEST_DESELECT=(
- dandi/tests/test_files.py::test_validate_bogus
+PATCHES=(
+ "${FILESDIR}/${PN}-0.55.0-hdf5.patch"
)
distutils_enable_tests pytest
diff --git a/dev-vcs/dandi-cli/files/dandi-cli-0.55.0-hdf5.patch b/dev-vcs/dandi-cli/files/dandi-cli-0.55.0-hdf5.patch
new file mode 100644
index 000000000..4cd55ca7e
--- /dev/null
+++ b/dev-vcs/dandi-cli/files/dandi-cli-0.55.0-hdf5.patch
@@ -0,0 +1,29 @@
+From d16bf0855e9ef7c029e8aca969ddfa04c1d7fdfd Mon Sep 17 00:00:00 2001
+From: "John T. Wodder II" <git@varonathe.org>
+Date: Thu, 25 May 2023 14:17:36 -0400
+Subject: [PATCH] Fix test for newer hdf5
+
+---
+ dandi/tests/test_files.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/dandi/tests/test_files.py b/dandi/tests/test_files.py
+index 4dbf0f223..3e44cf6b1 100644
+--- a/dandi/tests/test_files.py
++++ b/dandi/tests/test_files.py
+@@ -374,7 +374,14 @@ def test_validate_bogus(tmp_path):
+ errors = dandi_file(path).get_validation_errors()
+ # ATM we would get 2 errors -- since could not be open in two places,
+ # but that would be too rigid to test. Let's just see that we have expected errors
+- assert any(e.message.startswith("Unable to open file") for e in errors)
++ assert any(
++ e.message.startswith(
++ ("Unable to open file", "Unable to synchronously open file")
++ )
++ for e in errors
++ )
++ # Recent versions of hdf5 changed the error message, hence the need to
++ # check for two different patterns.
+
+
+ def test_upload_zarr(new_dandiset, tmp_path):
next reply other threads:[~2023-05-25 18:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-25 18:28 Horea Christian [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-25 7:08 [gentoo-commits] proj/sci:master commit in: dev-vcs/dandi-cli/files/, dev-vcs/dandi-cli/ Horea Christian
2023-01-12 22:10 Horea Christian
2023-01-03 18:25 Andrew Ammerlaan
2022-04-05 6:38 Horea Christian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1685039304.aaab8fcd6ed41cbce7f58a0a47f75f49e51b6d21.chymera@gentoo \
--to=horea.christ@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox