fix(test): update integration tests relatively to the samples update,…

… update `upload binaries` step in `python-package.yml`
AntaresSimulatorTeam · Jun 19, 2024 · 984bfad · 984bfad
1 parent 5103b2d
commit 984bfad
Show file tree

Hide file tree

Showing 100 changed files with 6,253 additions and 143 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -47,6 +47,7 @@ jobs:
         run: hatch run pyinstaller:build AntaresWebInstaller-${{ matrix.os }}
 
       - name: Upload binaries
+        if: ${{ matrix.python-version == '3.8' }}
         uses: actions/upload-artifact@v4
         with:
           name: AntaresWebInstaller-${{ matrix.os }}

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -15,7 +15,7 @@
 SPAWN_TIMEOUT = 1
 """Timeout in seconds to wait for the server process to start."""
 
-SERVER_TIMEOUT = 2
+SERVER_TIMEOUT = 5
 """Timeout in seconds to wait for the server to be ready."""
 
 

diff --git a/tests/integration/test_app.py b/tests/integration/test_app.py
@@ -21,11 +21,12 @@ def downloaded_dir_fixture(antares_web_server_path, tmp_path: Path) -> Path:
     downloaded_dir.mkdir(parents=True)
 
     # Copy sample data
-    sample_dir = SAMPLES_DIR.joinpath(os.name)
+    sample_dir = SAMPLES_DIR.joinpath(os.name, "AntaresWeb-2.15.2")
     shutil.copytree(sample_dir, downloaded_dir, dirs_exist_ok=True)
 
-    # The sample directory may contain an extra script which must be removed
-    downloaded_dir.joinpath("AntaresWeb/AntaresWebServer.py").unlink(missing_ok=True)
+    # The sample directory may contain an extra scripts that must be removed
+    downloaded_dir.joinpath("AntaresWeb/cli.py").unlink(missing_ok=True)
+    downloaded_dir.joinpath("AntaresWeb/server.py").unlink(missing_ok=True)
 
     # Patch the `AntaresWeb/AntaresWebServer.exe` file
     shutil.copy2(antares_web_server_path, downloaded_dir.joinpath("AntaresWeb"))

diff --git a/tests/samples/nt/AntaresWeb-2.14.4/AntaresWeb/AntaresWebServer.exe b/tests/samples/nt/AntaresWeb-2.14.4/AntaresWeb/AntaresWebServer.exe
diff --git a/tests/samples/nt/AntaresWeb-2.15.2/AntaresWeb/AntaresWebServer.exe b/tests/samples/nt/AntaresWeb-2.15.2/AntaresWeb/AntaresWebServer.exe
diff --git a/tests/samples/posix/AntaresWeb/AntaresTool → .../AntaresWeb-2.14.4/AntaresWeb/AntaresTool b/tests/samples/posix/AntaresWeb/AntaresTool → .../AntaresWeb-2.14.4/AntaresWeb/AntaresTool
diff --git a/tests/samples/posix/AntaresWeb/__init__.py → .../AntaresWeb-2.14.4/AntaresWeb/__init__.py b/tests/samples/posix/AntaresWeb/__init__.py → .../AntaresWeb-2.14.4/AntaresWeb/__init__.py
diff --git a/...six/AntaresWeb/_internal/certifi/py.typed → ...b-2.14.4/AntaresWeb/_internal/__init__.py b/...six/AntaresWeb/_internal/certifi/py.typed → ...b-2.14.4/AntaresWeb/_internal/__init__.py
diff --git a/...six/AntaresWeb/_internal/base_library.zip → ...4.4/AntaresWeb/_internal/base_library.zip b/...six/AntaresWeb/_internal/base_library.zip → ...4.4/AntaresWeb/_internal/base_library.zip
diff --git a/...x/AntaresWeb/_internal/certifi/cacert.pem → ...4/AntaresWeb/_internal/certifi/cacert.pem b/...x/AntaresWeb/_internal/certifi/cacert.pem → ...4/AntaresWeb/_internal/certifi/cacert.pem
diff --git a/...aresWeb/antares_solver/antares-8.8-solver → ...4.4/AntaresWeb/_internal/certifi/py.typed b/...aresWeb/antares_solver/antares-8.8-solver → ...4.4/AntaresWeb/_internal/certifi/py.typed
diff --git a/...email_validator-2.1.1.dist-info/INSTALLER → ...email_validator-2.1.1.dist-info/INSTALLER b/...email_validator-2.1.1.dist-info/INSTALLER → ...email_validator-2.1.1.dist-info/INSTALLER
diff --git a/...l/email_validator-2.1.1.dist-info/LICENSE → ...l/email_validator-2.1.1.dist-info/LICENSE b/...l/email_validator-2.1.1.dist-info/LICENSE → ...l/email_validator-2.1.1.dist-info/LICENSE
diff --git a/.../email_validator-2.1.1.dist-info/METADATA → .../email_validator-2.1.1.dist-info/METADATA b/.../email_validator-2.1.1.dist-info/METADATA → .../email_validator-2.1.1.dist-info/METADATA
diff --git a/...al/email_validator-2.1.1.dist-info/RECORD → ...al/email_validator-2.1.1.dist-info/RECORD b/...al/email_validator-2.1.1.dist-info/RECORD → ...al/email_validator-2.1.1.dist-info/RECORD
@@ -1,25 +1,25 @@
-../../../bin/email_validator,sha256=0O7tFgGvsWIeGaXEvsYpeF61h9tydRmY1UjiP7_Przk,317
-email_validator-2.1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-email_validator-2.1.1.dist-info/LICENSE,sha256=ZyF5dS4QkTSj-yvdB4Cyn9t6A5dPD1hqE66tUSlWLUw,1212
-email_validator-2.1.1.dist-info/METADATA,sha256=MdQTRFU1P-8zJanuHmDRDF5TaOktjmoUNLus2yjrfjs,26149
-email_validator-2.1.1.dist-info/RECORD,,
-email_validator-2.1.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-email_validator-2.1.1.dist-info/entry_points.txt,sha256=zRM_6bNIUSHTbNx5u6M3nK1MAguvryrc9hICC6HyrBg,66
-email_validator-2.1.1.dist-info/top_level.txt,sha256=fYDOSWFZke46ut7WqdOAJjjhlpPYAaOwOwIsh3s8oWI,16
-email_validator/__init__.py,sha256=PoZLrr5AblW0FfPlT-EBKwOmM07xHw7ZtfHECZLz75Q,4211
-email_validator/__main__.py,sha256=SgarDcfH3W5KlcuUi6aaiQPqMdL3C-mOZVnTS6WesS4,2146
-email_validator/__pycache__/__init__.cpython-38.pyc,,
-email_validator/__pycache__/__main__.cpython-38.pyc,,
-email_validator/__pycache__/deliverability.cpython-38.pyc,,
-email_validator/__pycache__/exceptions_types.cpython-38.pyc,,
-email_validator/__pycache__/rfc_constants.cpython-38.pyc,,
-email_validator/__pycache__/syntax.cpython-38.pyc,,
-email_validator/__pycache__/validate_email.cpython-38.pyc,,
-email_validator/__pycache__/version.cpython-38.pyc,,
-email_validator/deliverability.py,sha256=573d02Sx_YdlwPNW6yMRGQm5tUv3ffHUUGsShcs4mAY,5927
-email_validator/exceptions_types.py,sha256=wnHFGKAfiSiaJlsOA-WgKN-MyGE9AlTJit8oEZZW8Tw,5718
-email_validator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-email_validator/rfc_constants.py,sha256=lpfWHURNe8ZhxJ3VojfllTaZ8_y_VDPgMhrG3khoSA4,2721
-email_validator/syntax.py,sha256=zYWYGkSODYwFApqIg-Jfqgm4XIg0Cd-tGrrvCc-bIC4,27617
-email_validator/validate_email.py,sha256=GKI23zCdz30R1PY30u34zsPZCAX-T055-Lj5dygitlE,6597
-email_validator/version.py,sha256=zPJIgPGcoSNiD0qme18OnYJYE3A9VVytlhO-V5DaAW0,22
+../../../bin/email_validator,sha256=0O7tFgGvsWIeGaXEvsYpeF61h9tydRmY1UjiP7_Przk,317
+email_validator-2.1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+email_validator-2.1.1.dist-info/LICENSE,sha256=ZyF5dS4QkTSj-yvdB4Cyn9t6A5dPD1hqE66tUSlWLUw,1212
+email_validator-2.1.1.dist-info/METADATA,sha256=MdQTRFU1P-8zJanuHmDRDF5TaOktjmoUNLus2yjrfjs,26149
+email_validator-2.1.1.dist-info/RECORD,,
+email_validator-2.1.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+email_validator-2.1.1.dist-info/entry_points.txt,sha256=zRM_6bNIUSHTbNx5u6M3nK1MAguvryrc9hICC6HyrBg,66
+email_validator-2.1.1.dist-info/top_level.txt,sha256=fYDOSWFZke46ut7WqdOAJjjhlpPYAaOwOwIsh3s8oWI,16
+email_validator/__init__.py,sha256=PoZLrr5AblW0FfPlT-EBKwOmM07xHw7ZtfHECZLz75Q,4211
+email_validator/__main__.py,sha256=SgarDcfH3W5KlcuUi6aaiQPqMdL3C-mOZVnTS6WesS4,2146
+email_validator/__pycache__/__init__.cpython-38.pyc,,
+email_validator/__pycache__/__main__.cpython-38.pyc,,
+email_validator/__pycache__/deliverability.cpython-38.pyc,,
+email_validator/__pycache__/exceptions_types.cpython-38.pyc,,
+email_validator/__pycache__/rfc_constants.cpython-38.pyc,,
+email_validator/__pycache__/syntax.cpython-38.pyc,,
+email_validator/__pycache__/validate_email.cpython-38.pyc,,
+email_validator/__pycache__/version.cpython-38.pyc,,
+email_validator/deliverability.py,sha256=573d02Sx_YdlwPNW6yMRGQm5tUv3ffHUUGsShcs4mAY,5927
+email_validator/exceptions_types.py,sha256=wnHFGKAfiSiaJlsOA-WgKN-MyGE9AlTJit8oEZZW8Tw,5718
+email_validator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+email_validator/rfc_constants.py,sha256=lpfWHURNe8ZhxJ3VojfllTaZ8_y_VDPgMhrG3khoSA4,2721
+email_validator/syntax.py,sha256=zYWYGkSODYwFApqIg-Jfqgm4XIg0Cd-tGrrvCc-bIC4,27617
+email_validator/validate_email.py,sha256=GKI23zCdz30R1PY30u34zsPZCAX-T055-Lj5dygitlE,6597
+email_validator/version.py,sha256=zPJIgPGcoSNiD0qme18OnYJYE3A9VVytlhO-V5DaAW0,22
diff --git a/...nal/email_validator-2.1.1.dist-info/WHEEL → ...nal/email_validator-2.1.1.dist-info/WHEEL b/...nal/email_validator-2.1.1.dist-info/WHEEL → ...nal/email_validator-2.1.1.dist-info/WHEEL
diff --git a/...alidator-2.1.1.dist-info/entry_points.txt → ...alidator-2.1.1.dist-info/entry_points.txt b/...alidator-2.1.1.dist-info/entry_points.txt → ...alidator-2.1.1.dist-info/entry_points.txt
diff --git a/...l_validator-2.1.1.dist-info/top_level.txt → ...l_validator-2.1.1.dist-info/top_level.txt b/...l_validator-2.1.1.dist-info/top_level.txt → ...l_validator-2.1.1.dist-info/top_level.txt
diff --git a/...ortlib_metadata-7.1.0.dist-info/INSTALLER → ...ortlib_metadata-7.1.0.dist-info/INSTALLER b/...ortlib_metadata-7.1.0.dist-info/INSTALLER → ...ortlib_metadata-7.1.0.dist-info/INSTALLER
diff --git a/...mportlib_metadata-7.1.0.dist-info/LICENSE → ...mportlib_metadata-7.1.0.dist-info/LICENSE b/...mportlib_metadata-7.1.0.dist-info/LICENSE → ...mportlib_metadata-7.1.0.dist-info/LICENSE
diff --git a/...portlib_metadata-7.1.0.dist-info/METADATA → ...portlib_metadata-7.1.0.dist-info/METADATA b/...portlib_metadata-7.1.0.dist-info/METADATA → ...portlib_metadata-7.1.0.dist-info/METADATA
diff --git a/...importlib_metadata-7.1.0.dist-info/RECORD → ...importlib_metadata-7.1.0.dist-info/RECORD b/...importlib_metadata-7.1.0.dist-info/RECORD → ...importlib_metadata-7.1.0.dist-info/RECORD
@@ -1,29 +1,29 @@
-importlib_metadata-7.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-importlib_metadata-7.1.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-importlib_metadata-7.1.0.dist-info/METADATA,sha256=E4z5cKjydu7RGKbGvm876vG3Lxhd55OcXDhGoka7drQ,4690
-importlib_metadata-7.1.0.dist-info/RECORD,,
-importlib_metadata-7.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-importlib_metadata-7.1.0.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19
-importlib_metadata/__init__.py,sha256=lAFrEbJHarqSCdkubZebZSDAe20ES_h-ZFqVyv4bn8Y,34302
-importlib_metadata/__pycache__/__init__.cpython-38.pyc,,
-importlib_metadata/__pycache__/_adapters.cpython-38.pyc,,
-importlib_metadata/__pycache__/_collections.cpython-38.pyc,,
-importlib_metadata/__pycache__/_compat.cpython-38.pyc,,
-importlib_metadata/__pycache__/_functools.cpython-38.pyc,,
-importlib_metadata/__pycache__/_itertools.cpython-38.pyc,,
-importlib_metadata/__pycache__/_meta.cpython-38.pyc,,
-importlib_metadata/__pycache__/_text.cpython-38.pyc,,
-importlib_metadata/__pycache__/diagnose.cpython-38.pyc,,
-importlib_metadata/_adapters.py,sha256=jZr_CmHrl8qTGatO0yMmuOdfFExOY64G8eEYf6Cnj9k,2455
-importlib_metadata/_collections.py,sha256=CJ0OTCHIjWA0ZIVS4voORAsn2R4R2cQBEtPsZEJpASY,743
-importlib_metadata/_compat.py,sha256=73QKrN9KNoaZzhbX5yPCCZa-FaALwXe8TPlDR72JgBU,1314
-importlib_metadata/_functools.py,sha256=PsY2-4rrKX4RVeRC1oGp1lB1pmC9eKN88_f-bD9uOoA,2895
-importlib_metadata/_itertools.py,sha256=cvr_2v8BRbxcIl5x5ldfqdHjhI8Yi8s8yk50G_nm6jQ,2068
-importlib_metadata/_meta.py,sha256=nxZ7C8GVlcBFAKWyVOn_dn7ot_twBcbm1NmvjIetBHI,1801
-importlib_metadata/_text.py,sha256=HCsFksZpJLeTP3NEk_ngrAeXVRRtTrtyh9eOABoRP4A,2166
-importlib_metadata/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_metadata/compat/__pycache__/__init__.cpython-38.pyc,,
-importlib_metadata/compat/__pycache__/py39.cpython-38.pyc,,
-importlib_metadata/compat/py39.py,sha256=cPkMv6-0ilK-0Jw_Tkn0xYbOKJZc4WJKQHow0c2T44w,1102
-importlib_metadata/diagnose.py,sha256=nkSRMiowlmkhLYhKhvCg9glmt_11Cox-EmLzEbqYTa8,379
-importlib_metadata/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_metadata-7.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+importlib_metadata-7.1.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+importlib_metadata-7.1.0.dist-info/METADATA,sha256=E4z5cKjydu7RGKbGvm876vG3Lxhd55OcXDhGoka7drQ,4690
+importlib_metadata-7.1.0.dist-info/RECORD,,
+importlib_metadata-7.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+importlib_metadata-7.1.0.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19
+importlib_metadata/__init__.py,sha256=lAFrEbJHarqSCdkubZebZSDAe20ES_h-ZFqVyv4bn8Y,34302
+importlib_metadata/__pycache__/__init__.cpython-38.pyc,,
+importlib_metadata/__pycache__/_adapters.cpython-38.pyc,,
+importlib_metadata/__pycache__/_collections.cpython-38.pyc,,
+importlib_metadata/__pycache__/_compat.cpython-38.pyc,,
+importlib_metadata/__pycache__/_functools.cpython-38.pyc,,
+importlib_metadata/__pycache__/_itertools.cpython-38.pyc,,
+importlib_metadata/__pycache__/_meta.cpython-38.pyc,,
+importlib_metadata/__pycache__/_text.cpython-38.pyc,,
+importlib_metadata/__pycache__/diagnose.cpython-38.pyc,,
+importlib_metadata/_adapters.py,sha256=jZr_CmHrl8qTGatO0yMmuOdfFExOY64G8eEYf6Cnj9k,2455
+importlib_metadata/_collections.py,sha256=CJ0OTCHIjWA0ZIVS4voORAsn2R4R2cQBEtPsZEJpASY,743
+importlib_metadata/_compat.py,sha256=73QKrN9KNoaZzhbX5yPCCZa-FaALwXe8TPlDR72JgBU,1314
+importlib_metadata/_functools.py,sha256=PsY2-4rrKX4RVeRC1oGp1lB1pmC9eKN88_f-bD9uOoA,2895
+importlib_metadata/_itertools.py,sha256=cvr_2v8BRbxcIl5x5ldfqdHjhI8Yi8s8yk50G_nm6jQ,2068
+importlib_metadata/_meta.py,sha256=nxZ7C8GVlcBFAKWyVOn_dn7ot_twBcbm1NmvjIetBHI,1801
+importlib_metadata/_text.py,sha256=HCsFksZpJLeTP3NEk_ngrAeXVRRtTrtyh9eOABoRP4A,2166
+importlib_metadata/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_metadata/compat/__pycache__/__init__.cpython-38.pyc,,
+importlib_metadata/compat/__pycache__/py39.cpython-38.pyc,,
+importlib_metadata/compat/py39.py,sha256=cPkMv6-0ilK-0Jw_Tkn0xYbOKJZc4WJKQHow0c2T44w,1102
+importlib_metadata/diagnose.py,sha256=nkSRMiowlmkhLYhKhvCg9glmt_11Cox-EmLzEbqYTa8,379
+importlib_metadata/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/.../importlib_metadata-7.1.0.dist-info/WHEEL → .../importlib_metadata-7.1.0.dist-info/WHEEL b/.../importlib_metadata-7.1.0.dist-info/WHEEL → .../importlib_metadata-7.1.0.dist-info/WHEEL
diff --git a/...ib_metadata-7.1.0.dist-info/top_level.txt → ...ib_metadata-7.1.0.dist-info/top_level.txt b/...ib_metadata-7.1.0.dist-info/top_level.txt → ...ib_metadata-7.1.0.dist-info/top_level.txt
diff --git a/.../posix/AntaresWeb/_internal/libgcc_s.so.1 → ...2.14.4/AntaresWeb/_internal/libgcc_s.so.1 b/.../posix/AntaresWeb/_internal/libgcc_s.so.1 → ...2.14.4/AntaresWeb/_internal/libgcc_s.so.1
diff --git a/.../AntaresWeb/_internal/libpython3.8.so.1.0 → .../AntaresWeb/_internal/libpython3.8.so.1.0 b/.../AntaresWeb/_internal/libpython3.8.so.1.0 → .../AntaresWeb/_internal/libpython3.8.so.1.0
diff --git a/...posix/AntaresWeb/_internal/libstdc++.so.6 → ....14.4/AntaresWeb/_internal/libstdc++.so.6 b/...posix/AntaresWeb/_internal/libstdc++.so.6 → ....14.4/AntaresWeb/_internal/libstdc++.so.6
diff --git a/...ples/posix/AntaresWeb/_internal/server.py → ...Web-2.14.4/AntaresWeb/_internal/server.py b/...ples/posix/AntaresWeb/_internal/server.py → ...Web-2.14.4/AntaresWeb/_internal/server.py
diff --git a/...ernal/websockets-12.0.dist-info/INSTALLER → ...ernal/websockets-12.0.dist-info/INSTALLER b/...ernal/websockets-12.0.dist-info/INSTALLER → ...ernal/websockets-12.0.dist-info/INSTALLER
diff --git a/...nternal/websockets-12.0.dist-info/LICENSE → ...nternal/websockets-12.0.dist-info/LICENSE b/...nternal/websockets-12.0.dist-info/LICENSE → ...nternal/websockets-12.0.dist-info/LICENSE
diff --git a/...ternal/websockets-12.0.dist-info/METADATA → ...ternal/websockets-12.0.dist-info/METADATA b/...ternal/websockets-12.0.dist-info/METADATA → ...ternal/websockets-12.0.dist-info/METADATA