Unverified Commit 0d4ec880 authored by Nicola Soranzo's avatar Nicola Soranzo Committed by GitHub
Browse files

Merge pull request #19349 from nsoranzo/release_24.0_backport_4e650b4 

[24.0] Backport fix for ``test_singularity_container_test`` test
parents 54de5b86 c67ffe8c

.github/workflows/mulled.yaml

+2 −0
Original line number Diff line number Diff line
@@ -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

pytest.ini

+1 −1
Original line number Diff line number Diff line 
[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

test/unit/tool_util/mulled/test_mulled_update_singularity_containers.py

+3 −3
Original line number Diff line number Diff line
@@ -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