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

src/revpimodio2/__about__.py

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

tests/common/test_init_modio.py

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

tests/mainloop/test_mainloop.py

@@ -141,14 +141,15 @@ class TestMainloop(TestRevPiModIO):
 
         rpi.io.test1.unreg_event()
         rpi.io.test1.reg_event(xxx_timeout)
+        rpi.exit()
 
-        sleep(0.3)
-
-        # Exceed cylcle time in main loop
+        # Exceed cycle time in mainloop
         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
             sleep(0.1)
-        rpi.exit()
+            rpi.exit()
 
         del rpi