From 173f17073618f7f8700a80e1cef49f4bc4715771 Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Wed, 18 Dec 2024 18:33:45 +0100 Subject: [PATCH 1/2] Fix reactive reference for selection change warning dismissal --- .../CurrentHistory/HistoryOperations/SelectionChangeWarning.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue index cfb3c17149bb..3f1d7c8a468f 100644 --- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue +++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue @@ -31,7 +31,7 @@ function onDoNotShowAgain() { watch( () => props.querySelectionBreak, () => { - dismissCountDown.value = showSelectionQueryBreakWarning ? dismissSecs.value : 0; + dismissCountDown.value = showSelectionQueryBreakWarning.value ? dismissSecs.value : 0; } ); From c67ffe8c764ef29d5025dd00319bf68ba2ea9895 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Mon, 16 Dec 2024 15:02:48 +0000 Subject: [PATCH 2/2] Fix test_singularity_container_test test (which started failing since ubuntu-latest was moved to 24.04) by upgrading apptainer to >=1.3.3 to include https://github.com/apptainer/apptainer/pull/2262 . Fix: ``` > assert "samtools:1.0--1" in results["passed"], results E AssertionError: E {'failed': [{'commands': ['python -c "import pyBigWig; assert(pyBigWig.numpy ' E '== 1); assert(pyBigWig.remote == 1)"'], E 'container': 'pybigwig:0.3.22--py36h54a71a5_0', E 'errors': [{'command': 'python -c "import pyBigWig; ' E 'assert(pyBigWig.numpy == 1); ' E 'assert(pyBigWig.remote == 1)"', E 'output': '\x1b[91mERROR : Could not write info to ' E 'setgroups: Permission denied\n' E '\x1b[0m\x1b[91mERROR : Error while ' E 'waiting event for user namespace mappings: ' E 'no event received\n' E '\x1b[0m'}, E {'import': 'pyBigWig', E 'output': '\x1b[91mERROR : Could not write info to ' E 'setgroups: Permission denied\n' E '\x1b[0m\x1b[91mERROR : Error while ' E 'waiting event for user namespace mappings: ' E 'no event received\n' E '\x1b[0m'}], E 'import_lang': 'python -c', E 'imports': ['pyBigWig']}, E {'commands': ['samtools view --help 2>&1 | grep Notes > /dev/null'], E 'container': 'samtools:1.0--1', E 'errors': [{'command': 'samtools view --help 2>&1 | grep Notes > ' E '/dev/null', E 'output': '\x1b[91mERROR : Could not write info to ' E 'setgroups: Permission denied\n' E '\x1b[0m\x1b[91mERROR : Error while ' E 'waiting event for user namespace mappings: ' E 'no event received\n' E '\x1b[0m'}], E 'import_lang': 'python -c'}], E 'notest': ['yasm:1.3.0--0'], E 'passed': []} E assert 'samtools:1.0--1' in [] ``` Also: - Improve assertion messages to facilitate debugging --- .github/workflows/mulled.yaml | 2 ++ pytest.ini | 2 +- .../mulled/test_mulled_update_singularity_containers.py | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mulled.yaml b/.github/workflows/mulled.yaml index 4d33cc3febd7..6d36a454d807 100644 --- a/.github/workflows/mulled.yaml +++ b/.github/workflows/mulled.yaml @@ -44,6 +44,8 @@ jobs: key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-mulled - name: Install Apptainer's singularity uses: eWaterCycle/setup-apptainer@v2 + with: + apptainer-version: 1.3.6 # https://github.com/eWaterCycle/setup-apptainer/pull/68 - name: Install tox run: pip install tox - name: Run tests diff --git a/pytest.ini b/pytest.ini index 7c1d40306310..e2e406ef82ba 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = --doctest-continue-on-failure --verbosity=1 +addopts = --doctest-continue-on-failure --verbosity=1 --showlocals asyncio_mode = auto log_level = DEBUG # Install pytest-memray and set memray to true here to enable memory profiling of tests diff --git a/test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py b/test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py index 728757b52f31..9ec4e47b44f8 100644 --- a/test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py +++ b/test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py @@ -46,6 +46,6 @@ def test_singularity_container_test(tmp_path) -> None: "singularity", tmp_path, ) - assert "samtools:1.0--1" in results["passed"] - assert "pybigwig:0.3.22--py36h54a71a5_0" in results["passed"] - assert "yasm:1.3.0--0" in results["notest"] + assert "samtools:1.0--1" in results["passed"], results + assert "pybigwig:0.3.22--py36h54a71a5_0" in results["passed"], results + assert "yasm:1.3.0--0" in results["notest"], results