Skip to content

Clean up code & improve test coverage #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adeas31 merged 22 commits into from
Apr 23, 2025
Merged

Clean up code & improve test coverage #249

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c199951
Fix testModelicaSystemLoop
ondras12345 Apr 9, 2025
831a7d8
Use python3 features to clean up ModelicaSystem
ondras12345 Apr 9, 2025
0fe21a5
Fix warning in test_linearization
ondras12345 Apr 9, 2025
f5d07e6
Add more tests for ModelicaSystem methods
ondras12345 Apr 10, 2025
1304f8d
Add test for ModelicaSystem.getLinear*()
ondras12345 Apr 10, 2025
aab0957
Add test for ModelicaSystem.getContinuous()
ondras12345 Apr 10, 2025
0369afd
Improve test coverage
ondras12345 Apr 10, 2025
da9eb45
Remove unreachable code
ondras12345 Apr 10, 2025
04714e6
Add test for ModelicaSystem.optimize()
ondras12345 Apr 10, 2025
b221ab3
Use pathlib.Path in OMCSessionHelper
ondras12345 Apr 11, 2025
a18a6b3
Add tests for simulate() edge cases
ondras12345 Apr 11, 2025
1ce9ab8
Improve test coverage
ondras12345 Apr 11, 2025
ba03555
Use setCommandLineOptions()
ondras12345 Apr 11, 2025
7f4e0a9
Use f-strings in OMCSessionZMQ
ondras12345 Apr 11, 2025
50b2898
Simplify omc_process kill logic
ondras12345 Apr 11, 2025
1246d47
Drop Python2 workarounds
ondras12345 Apr 11, 2025
f67d393
Use f-strings in OMCSessionZMQ
ondras12345 Apr 11, 2025
1b94486
Remove unreachable code
ondras12345 Apr 11, 2025
02728a8
Fix _get_omc_path fails on Windows
ondras12345 Apr 11, 2025
41bae88
Fix createCSVData on Windows
ondras12345 Apr 12, 2025
747cc68
Do not run omc with shell=True
ondras12345 Apr 17, 2025
2be6fbd
Remove last remaining str.format() call
ondras12345 Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify omc_process kill logic 
... by dropping Python2 support
  • Loading branch information
@ondras12345
ondras12345 committed Apr 17, 2025
commit 50b28982d691fd2c4ded9b19bdaace5eb4380f12
26 changes: 7 additions & 19 deletions OMPython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,25 +391,13 @@ def __del__(self):
except Exception:
pass
self._omc_log_file.close()
if sys.version_info.major >= 3:
try:
self._omc_process.wait(timeout=2.0)
except Exception:
if self._omc_process:
self._omc_process.kill()
else:
for i in range(0, 100):
time.sleep(0.02)
if self._omc_process and (self._omc_process.poll() is not None):
break
# kill self._omc_process process if it is still running/exists
if self._omc_process is not None and self._omc_process.returncode is None:
logger.warning("OMC did not exit after being sent the quit() command; killing the process with pid=%s" % str(self._omc_process.pid))
if sys.platform == "win32":
self._omc_process.kill()
self._omc_process.wait()
else:
os.killpg(os.getpgid(self._omc_process.pid), signal.SIGTERM)
try:
self._omc_process.wait(timeout=2.0)
except Exception:
if self._omc_process:
print("OMC did not exit after being sent the quit() command; killing the process with pid={self._omc_process.pid}")
if sys.platform != "win32":
os.killpg(os.getpgid(self._omc_process.pid), signal.SIGTERM)
self._omc_process.kill()
self._omc_process.wait()

Expand Down