Skip to content
Snippets Groups Projects

Bugfix/overhaul dune python add test

Merged Bugfix/overhaul dune python add test
bugfix/overhaul-dune-python-add-test into master
Merged Samuel Burbulla requested to merge bugfix/overhaul-dune-python-add-test into master

The changes on this MR overhaul the dune_python_add_test command. There was some functionality missing that could not have been added easily, so I decided to rewrite some parts of it. Now it forwards to dune_add_test and therefore uses some functionality from there, e.g. CMAKE_GUARDS, MPI_RANKS, etc.

I tested with some core modules, but this should be also tested by some of you for different setups, use-cases and custom modules.

Edited by Samuel Burbulla

Merge request reports

Pipeline #52575 passed

Stage: test
Stage: downstream
Pipeline: Dune Nightly Test

#52576

    Pipeline passed for 5690837d on bugfix/overhaul-dune-python-add-test

    Approval is optional

    Merged by Andreas DednerAndreas Dedner 2 years ago (Jul 8, 2022 8:03am UTC)

    Merge details

    • Changes merged into master with 342f4762.
    • Deleted the source branch.

    Pipeline #52588 passed

    Stage: test
    Stage: downstream
    Pipeline: Dune Nightly Test

    #52589

      Pipeline passed for 342f4762 on master

      Activity

      Filter activity
      • Approvals
      • Assignees & reviewers
      • Comments (from bots)
      • Comments (from users)
      • Commits & branches
      • Edits
      • Labels
      • Lock status
      • Mentions
      • Merge request status
      • Tracking
    • Andreas Dedner
      Andreas Dedner @andreas.dedner ·
      Owner

      @samuel.burbulla have you figured out why the CI is failing? Is it an issue with the internal venv and the new test command not correctly using the python from the internal venv?

    • Samuel Burbulla added 13 commits

      added 13 commits

      • e2c61428...c2d47b9f - 7 commits from branch master
      • d6998b5a - Overhaul the dune_python_add_test command by forwarding to dune_add_test.
      • 12c830a4 - Fix embed tests.
      • 016a6fd6 - Use run-in-dune-env.
      • 4968fc67 - Add CMAKE_GUARDS to embed tests and increase timeout.
      • 6ecdf61f - Use correct CMAKE_GUARD for embed tests.
      • 7e655e18 - Set interpreter if no VENV_SETUP.

      Compare with previous version

      Toggle commit list
    • Samuel Burbulla added 1 commit

      added 1 commit

      • f4dcc30a - Set interpreter if no VENV_SETUP and use DUNE_ENABLE_PYTHONBINDINGS for guard.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 4c80c804 - Set interpreter if no VENV_SETUP and use DUNE_ENABLE_PYTHONBINDINGS for guard.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 6473f31d - Change the way VENVSETUP is used.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • b6a8313c - Add DUNE_ENABLE_PYTHONBINDINGS to embed tests' CMAKE_GUARD.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      Compare with previous version

    • Samuel Burbulla marked this merge request as draft from 56bba3ea

      marked this merge request as draft from 56bba3ea

    • Samuel Burbulla added 1 commit

      added 1 commit

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 66286eee - Fix handling of CMAKE_GUARD for embed tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 6d11ea2b - Fix handling of CMAKE_GUARD for embed tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 2931a159 - Fix handling of CMAKE_GUARD for embed tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 7d929431 - Fix handling of CMAKE_GUARD for embed tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • f14d73bb - Fix handling of CMAKE_GUARD for embed tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 36d444ba - Fix handling of CMAKE_GUARD for embed tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 291338b8 - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE as interpreter for embed tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 08c7aeea - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE also for PYTEST_INTERPRETER.

      Compare with previous version

    • Samuel Burbulla added 75 commits

      added 75 commits

      • 08c7aeea...183ca5b6 - 64 commits from branch master
      • c9644b0e - Overhaul the dune_python_add_test command by forwarding to dune_add_test.
      • b34bc428 - Fix embed tests.
      • 96275f3d - Use run-in-dune-env.
      • 93d46b11 - Add CMAKE_GUARDS to embed tests and increase timeout.
      • f85c390d - Use correct CMAKE_GUARD for embed tests.
      • 18b711f6 - Set interpreter if no VENV_SETUP and use DUNE_ENABLE_PYTHONBINDINGS for guard.
      • c0846e8d - Change the way VENVSETUP is used.
      • d8ef7d50 - Add DUNE_ENABLE_PYTHONBINDINGS to embed tests' CMAKE_GUARD.
      • 0c8305fb - Fix handling of CMAKE_GUARD for embed tests.
      • 5b9105eb - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE as interpreter for embed tests.
      • 71923d25 - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE also for PYTEST_INTERPRETER.

      Compare with previous version

      Toggle commit list
    • Samuel Burbulla added 1 commit

      added 1 commit

      • bbddb033 - Forward arguments to dune_add_test.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 6517af0b - Add python -m dune test <module> command.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • d82463f3 - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • f5913170 - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE and DUNE_PYTHON_VENVSETUP.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 5aa96cf5 - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE and DUNE_PYTHON_VENVSETUP.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 29c3f5b3 - Use DUNE_PYTHON_VIRTUALENV_EXECUTABLE and DUNE_PYTHON_VENVSETUP.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 119aea9e - Move tests back to old place.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • f90e6f73 - Overhaul the dune_python_add_test command by forwarding to dune_add_test.

      Compare with previous version

    • Samuel Burbulla resolved all threads

      resolved all threads

    • Samuel Burbulla resolved all threads

      resolved all threads

    • Samuel Burbulla marked this merge request as ready

      marked this merge request as ready

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 758d2482 - Overhaul the dune_python_add_test command by forwarding to dune_add_test.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 1f5fd967 - Increase default timeout for python tests.

      Compare with previous version

    • Samuel Burbulla added 1 commit

      added 1 commit

      • 5690837d - Increase default timeout for python tests.

      Compare with previous version

    • Samuel Burbulla
      Samuel Burbulla @samuel.burbulla ·
      Author Maintainer

      @andreas.dedner Ready from my side, nightly tests were successful.

    • Andreas Dedner mentioned in commit 342f4762

      mentioned in commit 342f4762

    • Andreas Dedner merged

      merged

      • Timo Koch
        Timo Koch @tkoch ·
        Owner

        @samuel.burbulla This introduces several bugs and leaves the documentation in an unfinished state

        • some args are not documented
        • CMAKE_GUARD won't work like this if multiple args are specified
        • WORKING_DIRECTORY is removed without deprecation which makes it being parsed as one of the MULTI arguments easily (this can be fatal, e.g. in the Dumux test suite)
        Edited by Timo Koch
      • Timo Koch
        Timo Koch @tkoch ·
        Owner

        I put some suggestions in !1156 (merged) so maybe we don't have to revert this.

      • Please register or sign in to reply
    • Timo Koch mentioned in commit 5cc5fd37

      mentioned in commit 5cc5fd37

    • Timo Koch mentioned in merge request !1156 (merged)

      mentioned in merge request !1156 (merged)

    • Samuel Burbulla mentioned in commit 7b9ec5fd

      mentioned in commit 7b9ec5fd

    • Timo Koch mentioned in commit fed9be44

      mentioned in commit fed9be44

    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
      • Please register or sign in to reply