revpi/revpimodio2
1
0
Fork 0
mirror of https://github.com/naruxde/revpimodio2.git synced 2025-11-08 22:03:53 +01:00
Code Issues Packages Releases Wiki Activity

Merge tag 'unstable/2.8.0_rc2' into pkg/debian_rc

Browse Source
This commit is contained in:
Sven Sager
2024-11-12 10:54:41 +01:00
parent 5cbc7d4c28 f50a7744cd
commit 0bbd94942d
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/revpimodio2/__about__.py
View File

@@ -3,4 +3,4 @@
__author__ = "Sven Sager <akira@revpimodio.org>" __author__ = "Sven Sager <akira@revpimodio.org>"
__copyright__ = "Copyright (C) 2023 Sven Sager" __copyright__ = "Copyright (C) 2023 Sven Sager"
__license__ = "LGPLv2" __license__ = "LGPLv2"
__version__ = "2.8.0rc1" __version__ = "2.8.0rc2"

19
tests/common/test_init_modio.py
View File

@@ -4,9 +4,10 @@ __author__ = "Sven Sager"
__copyright__ = "Copyright (C) 2024 Sven Sager" __copyright__ = "Copyright (C) 2024 Sven Sager"
__license__ = "GPLv2" __license__ = "GPLv2"
from os import remove from os import remove, makedirs
from os.path import join, dirname from os.path import join, dirname
from shutil import copyfile from shutil import copyfile
from warnings import warn
import revpimodio2 import revpimodio2
from .. import TestRevPiModIO from .. import TestRevPiModIO
@@ -30,11 +31,17 @@ class TestInitModio(TestRevPiModIO):
"configrsc": join(self.data_dir, "config.rsc"), "configrsc": join(self.data_dir, "config.rsc"),
} }
# Datei an richtigen Ort kopieren und löschen # Check default path of config.rsc
copyfile(defaultkwargs["configrsc"], "/opt/KUNBUS/config.rsc") for config_file in ("/opt/KUNBUS/config.rsc", "/etc/revpi/config.rsc"):
rpi = revpimodio2.RevPiModIO(procimg=self.fh_procimg.name) config_dir = dirname(config_file)
del rpi try:
remove("/opt/KUNBUS/config.rsc") makedirs(config_dir, exist_ok=True)
copyfile(defaultkwargs["configrsc"], config_file)
except PermissionError:
warn(f"Skip test for default location of '{config_file}' - permission denied")
else:
revpimodio2.RevPiModIO(procimg=self.fh_procimg.name)
remove(config_file)
# RevPiModIO # RevPiModIO
rpi = self.modio() rpi = self.modio()

7
tests/mainloop/test_mainloop.py
View File

@@ -141,11 +141,12 @@ class TestMainloop(TestRevPiModIO):
rpi.io.test1.unreg_event() rpi.io.test1.unreg_event()
rpi.io.test1.reg_event(xxx_timeout) rpi.io.test1.reg_event(xxx_timeout)
rpi.exit()
sleep(0.3) # Exceed cycle time in mainloop
# Exceed cylcle time in main loop
with self.assertWarnsRegex(RuntimeWarning, r"io refresh time of 0 ms exceeded!"): with self.assertWarnsRegex(RuntimeWarning, r"io refresh time of 0 ms exceeded!"):
rpi = self.modio(debug=False, autorefresh=True)
rpi.mainloop(blocking=False)
rpi._imgwriter._refresh = 0.0001 rpi._imgwriter._refresh = 0.0001
sleep(0.1) sleep(0.1)
rpi.exit() rpi.exit()