Skip to content

Commit aaffa1f

Browse files
committed
do not compare to a hard-coded version string but verify that there is a (gerneric) OpenModelica version string
1 parent 7e8b418 commit aaffa1f

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

tests/test_ModelicaSystemDoE.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ def test_ModelicaSystemDoE_local(tmp_path, model_doe, param_doe):
7575
@skip_python_older_312
7676
def test_ModelicaSystemDoE_docker(tmp_path, model_doe, param_doe):
7777
omcs = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
78-
assert omcs.sendExpression("getVersion()") == "OpenModelica 1.25.0"
78+
omversion = omcs.sendExpression("getVersion()")
79+
assert isinstance(omversion, str) and omversion.startswith("OpenModelica")
7980

8081
mod = OMPython.ModelicaSystem(
8182
session=omcs,
@@ -98,7 +99,8 @@ def test_ModelicaSystemDoE_docker(tmp_path, model_doe, param_doe):
9899
@skip_python_older_312
99100
def test_ModelicaSystemDoE_WSL(tmp_path, model_doe, param_doe):
100101
omcs = OMPython.OMCSessionWSL()
101-
assert omcs.sendExpression("getVersion()") == "OpenModelica 1.25.0"
102+
omversion = omcs.sendExpression("getVersion()")
103+
assert isinstance(omversion, str) and omversion.startswith("OpenModelica")
102104

103105
mod = OMPython.ModelicaSystem(
104106
session=omcs,

tests/test_OMCPath.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ def test_OMCPath_OMCProcessLocal():
2727
@skip_python_older_312
2828
def test_OMCPath_OMCProcessDocker():
2929
omcs = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
30-
assert omcs.sendExpression("getVersion()") == "OpenModelica 1.25.0"
30+
omversion = omcs.sendExpression("getVersion()")
31+
assert isinstance(omversion, str) and omversion.startswith("OpenModelica")
3132

3233
_run_OMCPath_checks(omcs)
3334

tests/test_docker.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
@skip_on_windows
1212
def test_docker():
1313
omcs = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
14-
assert omcs.sendExpression("getVersion()") == "OpenModelica 1.25.0"
14+
omversion = omcs.sendExpression("getVersion()")
15+
assert isinstance(omversion, str) and omversion.startswith("OpenModelica")
1516

1617
omcsInner = OMPython.OMCSessionDockerContainer(dockerContainer=omcs.get_docker_container_id())
17-
assert omcsInner.sendExpression("getVersion()") == "OpenModelica 1.25.0"
18+
omversion = omcsInner.sendExpression("getVersion()")
19+
assert isinstance(omversion, str) and omversion.startswith("OpenModelica")
1820

1921
omcs2 = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal", port=11111)
20-
assert omcs2.sendExpression("getVersion()") == "OpenModelica 1.25.0"
22+
omversion = omcs2.sendExpression("getVersion()")
23+
assert isinstance(omversion, str) and omversion.startswith("OpenModelica")
2124

2225
del omcs2
2326

0 commit comments

Comments
 (0)