From c5ff42fc4dedc807a086ca8be6f4c4fe09b8b1b9 Mon Sep 17 00:00:00 2001 From: Adeel Asghar Date: Fri, 4 Jul 2025 12:00:21 +0200 Subject: [PATCH] Enable docker test Update and pull docker image Run docker test only on Linux --- .github/workflows/Test.yml | 4 ++++ tests/test_docker.py | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 2056b220f..269a66c5f 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -48,6 +48,10 @@ jobs: 'Modelica 4.0.0' - run: "omc --version" + - name: Pull OpenModelica docker image + if: runner.os != 'Windows' + run: docker pull openmodelica/openmodelica:v1.25.0-minimal + - name: Run pytest uses: pavelzw/pytest-action@v2 with: diff --git a/tests/test_docker.py b/tests/test_docker.py index 88687e071..8d68f11f0 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -1,20 +1,26 @@ -import OMPython +import sys import pytest +import OMPython + +skip_on_windows = pytest.mark.skipif( + sys.platform.startswith("win"), + reason="OpenModelica Docker image is Linux-only; skipping on Windows.", +) -@pytest.mark.skip(reason="This test would fail") +@skip_on_windows def test_docker(): - omcp = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.16.1-minimal") + omcp = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal") om = OMPython.OMCSessionZMQ(omc_process=omcp) - assert om.sendExpression("getVersion()") == "OpenModelica 1.16.1" + assert om.sendExpression("getVersion()") == "OpenModelica 1.25.0" omcpInner = OMPython.OMCProcessDockerContainer(dockerContainer=omcp.get_docker_container_id()) omInner = OMPython.OMCSessionZMQ(omc_process=omcpInner) - assert omInner.sendExpression("getVersion()") == "OpenModelica 1.16.1" + assert omInner.sendExpression("getVersion()") == "OpenModelica 1.25.0" - omcp2 = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.16.1-minimal", port=11111) + omcp2 = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal", port=11111) om2 = OMPython.OMCSessionZMQ(omc_process=omcp2) - assert om2.sendExpression("getVersion()") == "OpenModelica 1.16.1" + assert om2.sendExpression("getVersion()") == "OpenModelica 1.25.0" del omcp2 del om2