Merge branch 'main' into dependabot/github_actions/stefanzweifel/git-auto-commit-action-7

Author: xaf

apps/qolsysgw/mqtt/listener.py

@@ -19,7 +19,11 @@ def __init__(self, app: Mqtt, namespace: str, topic: str,
         self._callback = callback or defaultLoggerCallback
         self._logger = logger or LOGGER
 
-        app.mqtt_subscribe(topic, namespace=namespace)
+        # Note: mqtt_subscribe is intentionally NOT called here.
+        # listen_event with event='MQTT_MESSAGE' handles both subscription
+        # and callback registration in AppDaemon. Calling both mqtt_subscribe
+        # and listen_event can cause duplicate event delivery in some
+        # AppDaemon versions.
         app.listen_event(self.event_callback, event='MQTT_MESSAGE',
                          topic=topic, namespace=namespace)
 

tests/end-to-end/test_qolsysgw.py

@@ -5,6 +5,7 @@
 import re
 import shlex
 import subprocess
+import sys
 import tempfile
 import unittest
 
@@ -79,6 +80,41 @@ def _docker_compose_down(self):
         self._docker_is_up = False
         return run
 
+    def _docker_fix_permissions_for_cleanup(self, service, path):
+        """Fix permissions on container-created files to allow temp directory cleanup.
+
+        Docker containers may create files with different ownership that the
+        test process cannot delete. This chmod's them before stopping containers.
+        """
+        try:
+            self._docker_compose('exec', '-T', service, 'chmod', '-R', '777', path)
+        except Exception:
+            pass  # Best effort - container might not be running
+
+    def _print_container_versions(self):
+        """Print the versions of the containers being used for debugging.
+
+        Uses sys.stderr to ensure output is visible even when pytest
+        captures stdout.
+        """
+        print('\n=== Container Versions ===', file=sys.stderr)
+        for service, container_name in self.CONTAINERS.items():
+            try:
+                # Get the image name and digest
+                result = subprocess.run(
+                    ['docker', 'inspect', '--format',
+                     '{{.Config.Image}} ({{.Image}})', container_name],
+                    capture_output=True,
+                    text=True,
+                )
+                if result.returncode == 0:
+                    print(f'{service}: {result.stdout.strip()}', file=sys.stderr)
+                else:
+                    print(f'{service}: unable to get version', file=sys.stderr)
+            except Exception as e:
+                print(f'{service}: error getting version - {e}', file=sys.stderr)
+        print('=== End Container Versions ===\n', file=sys.stderr)
+
     def setUp(self):
         self.CONTAINERS = {}
         self._tmpdir = tempfile.TemporaryDirectory(
@@ -88,6 +124,11 @@ def setUp(self):
 
     def tearDown(self):
         if hasattr(self, '_docker_is_up') and self._docker_is_up:
+            # Fix permissions on files created by containers before stopping them
+            # This allows the temp directory cleanup to work properly
+            self._docker_fix_permissions_for_cleanup('appdaemon', '/conf')
+            self._docker_fix_permissions_for_cleanup('homeassistant', '/config')
+
             # Stop and destroy containers
             self._docker_compose_down()
 
@@ -131,6 +172,9 @@ async def get_context(self):
         # Start containers
         self._docker_compose_up()
 
+        # Print container versions for debugging
+        self._print_container_versions()
+
         # Grab logs from AppDaemon
         appdaemon = AppDaemonDockerLogReader(
             container_name=self.CONTAINERS['appdaemon'],