1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
From: Roland Mas <roland.mas@entierement.net>
Date: Sun, 30 Nov 2025 16:44:58 +0100
Subject: Fix tqdm crash in testsuite
Description: Don't initialize tqdm in pytest.parametrize
because, as described in the bug, it may crash on exit
Author: Emmanuel Arias, Rebecca N. Palmer <rebecca_palmer@zoho.com>
Bug-Debian: https://bugs.debian.org/1101839
Forwarded: no
---
nxtomomill/converter/edf/tests/test_edf2nx.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/nxtomomill/converter/edf/tests/test_edf2nx.py b/nxtomomill/converter/edf/tests/test_edf2nx.py
index 243fa0d..7db533a 100644
--- a/nxtomomill/converter/edf/tests/test_edf2nx.py
+++ b/nxtomomill/converter/edf/tests/test_edf2nx.py
@@ -27,12 +27,19 @@ from nxtomomill.models.edf2nx import EDF2nxModel
"duplicate_data, external_link_type",
((False, "absolute"), (False, "relative"), (True, "absolute")),
)
-@pytest.mark.parametrize("progress", (None, tqdm(desc="conversion from edf")))
+@pytest.mark.parametrize("has_progress", (False, True))
@pytest.mark.skipif(
condition=(version.MINOR < 7 and version.MAJOR == 0),
reason="dark_n and ref_n from EDFTomoScan where not existing",
)
-def test_edf_to_nx_converter(tmp_path, progress, duplicate_data, external_link_type):
+def test_edf_to_nx_converter(tmp_path, has_progress, duplicate_data, external_link_type):
+ if has_progress:
+ # This is done here and not in parametrize() to avoid
+ # a crash on exit https://bugs.debian.org/1101839
+ progress = tqdm(desc="conversion from edf")
+ else:
+ progress=None
+
folder = tmp_path
scan_path = os.path.join(folder, "myscan")
|