diff --git a/.github/workflows/build_centos7.yml b/.github/workflows/build_centos7.yml index 942cc488a..2c452a584 100644 --- a/.github/workflows/build_centos7.yml +++ b/.github/workflows/build_centos7.yml @@ -142,18 +142,6 @@ jobs: export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH export PATH=/usr/lib64/openmpi/bin:$PATH cmake3 --build _build --config Release -j8 --target install - - - name: Issue688_test - timeout-minutes: 120 - shell: bash - run: | - source /etc/profile.d/modules.sh - module load mpi - export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }} - export XPRESS=${{ env.XPRESS_CONTAINER }} - cd _build - ctest3 -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests timeout-minutes: 120 shell: bash diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index a5e9aab4b..970f9e99b 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -119,11 +119,6 @@ jobs: run: | cmake --build _build --config Release -j8 - - name: Issue688_test - run: | - cd _build - ctest -C Release --output-on-failure -R "Issue688_test" - - name: Test run: | cd _build diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index fef2f2315..b9c156121 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -135,16 +135,6 @@ jobs: - name: Build run: | cmake --build _build --config Release -j2 --target install - - - name: Issue688_test - timeout-minutes: 120 - shell: cmd - run: | - set PATH=%PATH%;C:\Program Files\Microsoft MPI\Bin - set PATH=%PATH%;${{ env.XPRESS }} - cd _build - ctest -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests timeout-minutes: 120 shell: cmd diff --git a/.github/workflows/centos-release.yml b/.github/workflows/centos-release.yml index 192ecb24c..052d7e005 100644 --- a/.github/workflows/centos-release.yml +++ b/.github/workflows/centos-release.yml @@ -195,17 +195,6 @@ jobs: export PATH=/usr/lib64/openmpi/bin:$PATH cmake3 --build _build --config Release -j2 --target install - - name: Issue688_test - timeout-minutes: 120 - shell: bash - run: | - source /etc/profile.d/modules.sh - module load mpi - export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }} - export XPRESS=${{ env.XPRESS_CONTAINER }} - cd _build - ctest3 -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests timeout-minutes: 120 shell: bash diff --git a/.github/workflows/centos7-system-deps-build.yml b/.github/workflows/centos7-system-deps-build.yml index 6db7c68ae..a569ae826 100644 --- a/.github/workflows/centos7-system-deps-build.yml +++ b/.github/workflows/centos7-system-deps-build.yml @@ -100,13 +100,6 @@ jobs: export PATH=/usr/lib64/openmpi/bin:$PATH cmake3 --build _build --config Release -j2 --target install - - name: Issue688_test - run: | - source /etc/profile.d/modules.sh - module load mpi - cd _build - ctest3 -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests run: | source /etc/profile.d/modules.sh diff --git a/.github/workflows/ubuntu-release.yml b/.github/workflows/ubuntu-release.yml index d7f8dc3f2..e6e7dfc25 100644 --- a/.github/workflows/ubuntu-release.yml +++ b/.github/workflows/ubuntu-release.yml @@ -190,11 +190,6 @@ jobs: #Cpack command line doesn't seem to care about -P or -R options echo "TGZ_NAME=$FILE_NAME.tar.gz" >> $GITHUB_ENV - - name: Issue688_test - run: | - cd _build - ctest -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests run: | cd _build diff --git a/.github/workflows/ubuntu-system-deps-build.yml b/.github/workflows/ubuntu-system-deps-build.yml index 4cd67adff..3985ce4d0 100644 --- a/.github/workflows/ubuntu-system-deps-build.yml +++ b/.github/workflows/ubuntu-system-deps-build.yml @@ -70,11 +70,6 @@ jobs: run: | cmake --build _build --config Release -j2 --target install - - name: Issue688_test - run: | - cd _build - ctest -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests run: | cd _build diff --git a/.github/workflows/windows-vcpkg-deps-build.yml b/.github/workflows/windows-vcpkg-deps-build.yml index 73b93e2dd..38be25c1a 100644 --- a/.github/workflows/windows-vcpkg-deps-build.yml +++ b/.github/workflows/windows-vcpkg-deps-build.yml @@ -96,13 +96,6 @@ jobs: run: | cmake --build _build --config Release -j2 --target install - - name: Issue688_test - shell: cmd - run: | - set PATH=%PATH%;C:\Program Files\Microsoft MPI\Bin\ - cd _build - ctest -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests shell: cmd run: | diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 7b7d5b39b..a7e240815 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -188,14 +188,6 @@ jobs: run: | cmake --build _build --config Release -j2 --target install - - name: Issue688_test - shell: cmd - run: | - set PATH=%PATH%;C:\Program Files\Microsoft MPI\Bin\ - set PATH=%PATH%;${{ env.XPRESS }} - cd _build - ctest -C Release --output-on-failure -R "Issue688_test" - - name: Running unit tests shell: cmd run: | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 611561742..6b19951d1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -16,14 +16,6 @@ if (PYTHON_MODULE_pytest_FOUND AND PYTHON_MODULE_numpy_FOUND) if(${XPRESS}) set(xpress_avalaible "True") endif() - - add_test( - NAME Issue688_test - COMMAND Python3::Interpreter -m pytest -m Issue688_test --allow_run_as_root=${ALLOW_RUN_AS_ROOT} --installDir=${XPANSION_INSTALL_DIR} example_test.py - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/end_to_end/examples - ) - set_property(TEST Issue688_test PROPERTY LABELS Issue688_test) - # Python unit test add_test( NAME unit_launcher diff --git a/tests/end_to_end/examples/example_test.py b/tests/end_to_end/examples/example_test.py index b47440fa5..c58152865 100644 --- a/tests/end_to_end/examples/example_test.py +++ b/tests/end_to_end/examples/example_test.py @@ -12,7 +12,6 @@ import pytest from src.python.antares_xpansion.candidates_reader import CandidatesReader -Issue688_Test = Path("../../../examples/SmallTestSixCandidatesWithPlaylist") ALL_STUDIES_PATH = Path("../../../data_test/examples") RELATIVE_TOLERANCE = 1e-4 RELATIVE_TOLERANCE_LIGHT = 1e-2 @@ -267,21 +266,6 @@ def assert_ntc_update_pre_820( rtol=RELATIVE_TOLERANCE_LIGHT, ) -@pytest.mark.Issue688_test -def test_six_candidates_with_playlists_10_monte_carlo_years( - install_dir, - allow_run_as_root, - tmp_path -): - study_path = Issue688_Test - tmp_study = tmp_path / study_path.name - shutil.copytree(study_path, tmp_study) - shutil.copyfile(tmp_study/"settings"/"10MC-generaldata.ini", tmp_study/"settings"/"generaldata.ini") -# launch_xpansion(install_dir, tmp_study, -# BendersMethod.BENDERS, allow_run_as_root, 1) - # verify_solution(tmp_study, expected_values, expected_investment_solution) - # verify_study_update( - # tmp_study, expected_investment_solution, antares_version) ## TESTS ## parameters_names = ( diff --git a/tests/end_to_end/examples/pytest.ini b/tests/end_to_end/examples/pytest.ini index f932fb03c..798ccc435 100644 --- a/tests/end_to_end/examples/pytest.ini +++ b/tests/end_to_end/examples/pytest.ini @@ -10,5 +10,4 @@ markers = short_mpi: mark a test as parallel short short_benders_by_batch_mpi: benders by batch short mpi tests medium_benders_by_batch_mpi: benders by batch medium mpi tests - long_benders_by_batch_mpi: benders by batch medium mpi tests - Issue688_test: 10 Mc years activated \ No newline at end of file + long_benders_by_batch_mpi: benders by batch medium mpi tests \ No newline at end of file