Skip to content
Snippets Groups Projects
Commit c2a98a38 authored by Pierre Augier's avatar Pierre Augier
Browse files

Fix skipif_openfoam_too_old usage

parent 5cbdf79a
No related branches found
No related tags found
1 merge request!101CI: install OpenFOAM
......@@ -35,7 +35,7 @@
@skipif_executable_not_available("chtMultiRegionFoam")
@skipif_openfoam_too_old
@skipif_openfoam_too_old()
def test_run_parallel():
os.environ["OMPI_MCA_rmaps_base_oversubscribe"] = "true"
params = Simul.create_default_params()
......
......@@ -29,7 +29,7 @@
@skipif_executable_not_available("icoFoam")
@skipif_openfoam_too_old
@skipif_openfoam_too_old()
def test_run():
params = Simul.create_default_params()
params.output.sub_directory = "tests_fluidsimfoam/phill"
......
......@@ -29,8 +29,8 @@
if openfoam_version is None:
has_to_skip = True
reason = "OpenFOAM not available"
elif len(openfoam_version) == 5:
version_date_available = int(openfoam_version[1:])
elif len(openfoam_version) == 4:
version_date_available = int(openfoam_version)
has_to_skip = version_date_available < version_date
reason = f"OpenFOAM ({openfoam_version}) too old"
else:
......
......@@ -52,4 +52,5 @@
process = run(["icoFoam", "-help"], text=True, capture_output=True)
except FileNotFoundError:
return None
return process.stdout.split("Using: OpenFOAM-")[1].split()[0]
version = process.stdout.split("Using: OpenFOAM-")[1].split()[0]
return version.removeprefix("v").removeprefix("(").removesuffix(")")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment