Clean up

Author: AnHeuermann

single-model.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-import sys, argparse
-import simplejson as json
+import argparse
 import shared
 
 parser = argparse.ArgumentParser(description='OpenModelica model testing report generation tool')
@@ -21,8 +20,7 @@
 
 libs = {}
 
-import cgi, sqlite3, time, datetime
-from omcommon import friendlyStr, multiple_replace
+import sqlite3, datetime
 
 conn = sqlite3.connect('sqlite3.db')
 cursor = conn.cursor()

test.py

@@ -8,11 +8,10 @@
 if (sys.version_info < (3, 0)):
   raise Exception("Python2 is no longer supported")
 
-import html, shutil, os, re, glob, time, argparse, sqlite3, datetime, math, platform
+import html, shutil, os, re, glob, time, argparse, sqlite3, datetime, math
 from joblib import Parallel, delayed
 import simplejson as json
 import psutil, subprocess, threading, hashlib
-from subprocess import call
 from monotonic import monotonic
 from omcommon import friendlyStr, multiple_replace
 from natsort import natsorted

testmodel.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import argparse, os, sys, signal, threading, psutil, subprocess, shutil
-from asyncio.subprocess import STDOUT
 import simplejson as json
 from monotonic import monotonic
 from OMPython import OMCSessionZMQ, OMCProcessDocker
@@ -58,7 +57,7 @@ def writeResult():
 
 startJob=monotonic()
 
-def quit_omc(omc):
+def quit_omc(omc: OMCSessionZMQ | None):
   if omc is None:
     return omc
   try:
@@ -72,7 +71,7 @@ def quit_omc(omc):
   omc = None
   return omc
 
-def writeResultAndExit(exitStatus, useOsExit=False, omc=None, omc_new=None):
+def writeResultAndExit(exitStatus: int, useOsExit: bool = False, omc: OMCSessionZMQ | None = None, omc_new: OMCSessionZMQ | None = None):
   writeResult()
   print("Calling exit ...")
   with open(errFile, 'a+') as fp:
@@ -90,7 +89,7 @@ def writeResultAndExit(exitStatus, useOsExit=False, omc=None, omc_new=None):
   else:
     sys.exit(exitStatus)
 
-def sendExpressionTimeout(omc, cmd, timeout):
+def sendExpressionTimeout(omc: OMCSessionZMQ, cmd: str, timeout: int):
   with open(errFile, 'a+') as fp:
     fp.write("%s [Timeout %s]\n" % (cmd, timeout))
   def target(res):

testresults.md

@@ -2,42 +2,76 @@
 
 ## Test reports
 
-- **Overview with library test results across OMC versions**: These reports shows how libraries with full or partial support level
-  (see [here](https://github.com/OpenModelica/OMPackageManager/blob/master/README.md#library-support-levels-in-openmodelica) for more details)
-  are handled by released versions of OpenModelica and by the development version on the master branch. Regressions are marked in orange,
+- **Overview with library test results across OMC versions**:
+  These reports shows how libraries with full or partial support level (see
+  [OMPackageManager, Library support levels](https://github.com/OpenModelica/OMPackageManager/blob/master/README.md#library-support-levels-in-openmodelica)
+  for more details) are handled by released versions of OpenModelica and by the
+  development version on the master branch. Regressions are marked in orange,
   improvements in green.
-  - [Default settings](https://libraries.openmodelica.org/branches/overview.html): simulation with C runtime and default settings
-  - [daeMode](https://libraries.openmodelica.org/branches/overview-dae.html): simulation with daeMode (compiler flag [--daeMode](https://openmodelica.org/doc/OpenModelicaUsersGuide/latest/omchelptext.html#omcflag-daemode))
-  - [C++](https://libraries.openmodelica.org/branches/overview-c++.html): simulation with C++ runtime
-  - [FMI](https://libraries.openmodelica.org/branches/overview-fmi.html): simulation with FMI and C runtime
-  - [FMI C++](https://libraries.openmodelica.org/branches/overview-c++.html): simulation with FMI and C++ runtime
-- **Regression reports and history plots**: regression reports are periodically generated, using the latest development version of OMC.
-  Changes w.r.t. the previous report are shown. For each tested library, .svg plots are also provided, showing the trends of the
-  results of each step over time.
-  - [Default settings](https://libraries.openmodelica.org/branches/history/master/): default omc settings, C runtime
-  - [daeMode](https://libraries.openmodelica.org/branches/history/daemode/): simulation with --daeMode
-  - [C++](https://libraries.openmodelica.org/branches/history/cpp/): simulation with C++ runtime
-  - [FMI](https://libraries.openmodelica.org/branches/history/master-fmi/): simulation with FMI, C runtime
+
+  - [Default settings](https://libraries.openmodelica.org/branches/overview.html):
+    simulation with C runtime and default settings
+  - [daeMode](https://libraries.openmodelica.org/branches/overview-dae.html):
+    simulation with daeMode (compiler flag
+    [--daeMode](https://openmodelica.org/doc/OpenModelicaUsersGuide/latest/omchelptext.html#omcflag-daemode))
+  - [C++](https://libraries.openmodelica.org/branches/overview-c++.html):
+    simulation with C++ runtime
+  - [FMI](https://libraries.openmodelica.org/branches/overview-fmi.html):
+    simulation with FMI and C runtime
+  - [FMI C++](https://libraries.openmodelica.org/branches/overview-c++.html):
+    simulation with FMI and C++ runtime
+
+- **Regression reports and history plots**:
+  Regression reports are periodically generated, using the latest development
+  version of OMC. Changes w.r.t. the previous report are shown. For each tested
+  library, .svg plots are also provided, showing the trends of the results of
+  each step over time.
+
+  - [Default settings](https://libraries.openmodelica.org/branches/history/master/):
+    default omc settings, C runtime
+  - [daeMode](https://libraries.openmodelica.org/branches/history/daemode/):
+    simulation with --daeMode
+  - [C++](https://libraries.openmodelica.org/branches/history/cpp/):
+    simulation with C++ runtime
+  - [FMI](https://libraries.openmodelica.org/branches/history/master-fmi/):
+    simulation with FMI, C runtime
 
 ## How to read the test reports
 
-The library testsuite job is run every night on the OSMC servers, testing open-source Modelica libraries covered by the
-[Package Manager](https://github.com/OpenModelica/OMPackageManager#readme) with various versions of OpenModelica,
-including the development version on the master branch. The simulations are run with the C-runtime, unless specified differently.
+The library testsuite job is run every night on the OSMC servers, testing
+open-source Modelica libraries covered by the
+[Package Manager](https://github.com/OpenModelica/OMPackageManager#readme)
+with various versions of OpenModelica, including the development version on the
+master branch. The simulations are run with the C-runtime, unless specified
+differently.
+
+Within each library, all models with an experiment(StopTime) annotations are
+run. For each tested model, the results of the following steps are reported:
 
-Within each library, all models with an experiment(StopTime) annotations are run. For each tested model, the results of the following steps are reported:
 - _parsing_
 - _frontend_: flattening the model
-- _backend_: structural analysis, index reduction, causalization, tearing, and all kind of symbolic manipulations and optimization to solve the model efficiently
+- _backend_: structural analysis, index reduction, causalization, tearing, and
+  all kind of symbolic manipulations and optimization to solve the model
+  efficiently
 - _simcode_: intermediate stap towards simulation code generation
 - _templates_: generation of the actual C code
 - _compilation_: compilation of the C code into a simulation executable
 - _simulation_: the simulation is actually run to produce simulation results
-- _verification_: if reference results file are available, they are compared with the simulation results
+- _verification_: if reference results file are available, they are compared
+  with the simulation results
 
-Clicking on the model name shows the log of phases from parsing to compilation. Clicking on the (sim) link shows the log of the runtime simulation.
+Clicking on the model name shows the log of phases from parsing to compilation.
+Clicking on the (sim) link shows the log of the runtime simulation.
 
 ## How to get your open-source library in the testsuite
 
-If you are actively developing an open-source Modelica library using a GIT repository, you can easily get it included in the OpenModelica library testsuite. Please open a request on the [OpenModelica issue tracker](https://github.com/OpenModelica/OpenModelica/issues/new/choose).
-Ideally, you should have two tests for it: one testing the latest official release, which can be used to check if changes to OMC cause regressions to the existing library, another one testing the development version, which also checks regressions caused by changes to the library code. You can then bookmark the page with the regression reports and the page with the test results obtained with your favourite settings.
+If you are actively developing an open-source Modelica library using a GIT
+repository, you can easily get it included in the OpenModelica library
+testsuite. Please open a request on the
+[OpenModelica issue tracker](https://github.com/OpenModelica/OpenModelica/issues/new/choose).
+Ideally, you should have two tests for it: one testing the latest official
+release, which can be used to check if changes to OMC cause regressions to the
+existing library, another one testing the development version, which also checks
+regressions caused by changes to the library code. You can then bookmark the
+page with the regression reports and the page with the test results obtained
+with your favourite settings.