Fixing testmodel.py

Author: AnHeuermann

conversionscript.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from OMPython import OMCSessionZMQ, pyparsing
+from OMPython import OMCSessionZMQ
+import pyparsing
 import argparse
 import glob
 import json
@@ -32,12 +33,12 @@
 os.mkdir("converted-libraries/.openmodelica")
 os.mkdir("converted-libraries/.openmodelica/libraries")
 
-def omcAssert(omc, cmd, extra=""):
+def omcAssert(omc: OMCSessionZMQ, cmd: str, extra: str = ""):
   res = omc.sendExpression(cmd)
   if not res:
     raise Exception(cmd + "\n" + extra + "\n" + (omc.sendExpression("getErrorString()") or ""))
 
-def omcSendExpression(omc, cmd, extra=""):
+def omcSendExpression(omc: OMCSessionZMQ, cmd: str, extra: str = ""):
   try:
     return omc.sendExpression(cmd)
   except pyparsing.ParseException as e:

testmodel.py

@@ -5,7 +5,7 @@
 from asyncio.subprocess import STDOUT
 import simplejson as json
 from monotonic import monotonic
-from OMPython import OMCSession, OMCSessionZMQ
+from OMPython import OMCSessionZMQ, OMCProcessDocker
 import shared, glob
 
 parser = argparse.ArgumentParser(description='OpenModelica library testing tool helper (single model)')
@@ -251,7 +251,11 @@ def target(res):
 os.environ["OPENMODELICAHOME"] = omhome
 
 def createOmcSession():
-  return OMCSession(docker=docker, dockerExtraArgs=dockerExtraArgs, timeout=5) if corbaStyle else OMCSessionZMQ(docker=docker, dockerExtraArgs=dockerExtraArgs, timeout=5)
+  if docker:
+    return OMCProcessDocker(docker=docker, dockerExtraArgs=dockerExtraArgs, timeout=5)
+  else:
+    return OMCSessionZMQ(timeout=5)
+
 def createOmcSessionNew():
   if ompython_omhome != "":
     os.environ["OPENMODELICAHOME"] = ompython_omhome