OMCSessionZMQDocker => class OMCProcessDocker

Author: syntron

OMPython/OMCSession.py

@@ -610,7 +610,7 @@ def _omc_port_get_main(self) -> Optional[str]:
 
 
 # noinspection PyPep8Naming
-class OMCSessionZMQDocker(OMCSessionZMQ):
+class OMCProcessDocker(OMCProcessLocal):
 
     def __init__(self,
                  timeout: float = 10.00,

OMPython/__init__.py

@@ -37,7 +37,7 @@
 """
 
 from OMPython.ModelicaSystem import LinearizationResult, ModelicaSystem, ModelicaSystemCmd, ModelicaSystemError
-from OMPython.OMCSession import OMCSessionCmd, OMCSessionException, OMCSessionZMQ, OMCSessionZMQDocker
+from OMPython.OMCSession import OMCSessionCmd, OMCSessionException, OMCSessionZMQ, OMCProcessDummy, OMCProcessDocker
 
 # global names imported if import 'from OMPython import *' is used
 __all__ = [
@@ -49,5 +49,5 @@
     'OMCSessionCmd',
     'OMCSessionException',
     'OMCSessionZMQ',
-    'OMCSessionZMQDocker',
+    'OMCProcessDocker',
 ]

tests/test_docker.py

@@ -6,14 +6,25 @@
 class DockerTester(unittest.TestCase):
     @pytest.mark.skip(reason="This test would fail")
     def testDocker(self):
-        om = OMPython.OMCSessionZMQDocker(docker="openmodelica/openmodelica:v1.16.1-minimal")
+        omcp = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.16.1-minimal")
+        om = OMPython.OMCSessionZMQ(omc_process=omcp)
         assert om.sendExpression("getVersion()") == "OpenModelica 1.16.1"
-        omInner = OMPython.OMCSessionZMQDocker(dockerContainer=om._dockerCid)
+
+        omcpInner = OMPython.OMCProcessDocker(dockerContainer=om._dockerCid)
+        omInner = OMPython.OMCSessionZMQ(omc_process=omcpInner)
         assert omInner.sendExpression("getVersion()") == "OpenModelica 1.16.1"
-        om2 = OMPython.OMCSessionZMQDocker(docker="openmodelica/openmodelica:v1.16.1-minimal", port=11111)
+
+        omcp2 = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.16.1-minimal", port=11111)
+        om2 = OMPython.OMCSessionZMQ(omc_process=omcp2)
         assert om2.sendExpression("getVersion()") == "OpenModelica 1.16.1"
+
+        del omcp2
         del om2
+
+        del omcpInner
         del omInner
+
+        del omcp
         del om