more fixes

Author: aw-was-here

tests-qt/test_systemtray.py

@@ -418,7 +418,7 @@ def test_settings_ui_creation_error_handling(qtbot, mock_dependencies):
     # Mock the error dialog to avoid actual UI display during tests
     with patch('nowplaying.systemtray.Tray._show_installation_error') as mock_error_dialog, \
          patch('nowplaying.settingsui.SettingsUI',
-               side_effect=Exception("Settings UI creation failed")):
+               side_effect=RuntimeError("Settings UI creation failed")):
 
         # This should trigger the installation error dialog
         nowplaying.systemtray.Tray(beam=False)

tests/test_artistextras_wikimedia.py

@@ -164,8 +164,16 @@ async def test_wikimedia_http_error_handling(bootstrap):
 
         def make_mock_http_error(status_code):
 
-            async def mock_http_error(*args, **kwargs):
-                raise ClientResponseError(request_info=None,
+            async def mock_http_error(*args, **kwargs):  # pylint: disable=unused-argument
+                # Create a mock request_info with real_url attribute
+                class MockRequestInfo:  # pylint: disable=too-few-public-methods
+                    ''' Mock request info for ClientResponseError '''
+                    def __init__(self):
+                        self.real_url = (
+                            "https://en.wikipedia.org/api/rest_v1/page/summary/Test_Artist"
+                        )
+
+                raise ClientResponseError(request_info=MockRequestInfo(),
                                           history=(),
                                           status=status_code,
                                           message=f"HTTP {status_code}")

tests/test_imagecache.py

@@ -55,7 +55,18 @@ async def imagecache_with_dir(bootstrap):
     config = bootstrap
     dbdir = config.testdir.joinpath('imagecache')
     dbdir.mkdir()
-    yield nowplaying.imagecache.ImageCache(cachedir=dbdir)
+    cache = nowplaying.imagecache.ImageCache(cachedir=dbdir)
+    yield cache
+
+    # Cleanup: close cache to release file handles
+    with contextlib.suppress(Exception):
+        if hasattr(cache, 'close'):
+            cache.close()
+        # Force close any database connections
+        if hasattr(cache, 'databasefile'):
+            with contextlib.suppress(sqlite3.Error, Exception):
+                conn = sqlite3.connect(cache.databasefile)
+                conn.close()
 
 
 @pytest_asyncio.fixture
@@ -64,12 +75,26 @@ async def imagecache_with_stopevent(bootstrap):
     config = bootstrap
     dbdir = config.testdir.joinpath('imagecache')
     dbdir.mkdir()
+    created_caches = []
 
     def _create_imagecache(stopevent=None):
-        return nowplaying.imagecache.ImageCache(cachedir=dbdir, stopevent=stopevent)
+        cache = nowplaying.imagecache.ImageCache(cachedir=dbdir, stopevent=stopevent)
+        created_caches.append(cache)
+        return cache
 
     yield _create_imagecache
 
+    # Cleanup: close all created caches to release file handles
+    for cache in created_caches:
+        with contextlib.suppress(Exception):
+            if hasattr(cache, 'close'):
+                cache.close()
+            # Force close any database connections
+            if hasattr(cache, 'databasefile'):
+                with contextlib.suppress(sqlite3.Error, Exception):
+                    conn = sqlite3.connect(cache.databasefile)
+                    conn.close()
+
 
 @pytest.mark.skipif(sys.platform == "win32", reason="Windows cannot close fast enough")
 @pytest.mark.asyncio

tests/test_subprocesses.py

@@ -327,11 +327,23 @@ def test_windows_process_termination_timeout(subprocess_manager):
     ''' Test that Windows gets longer termination timeouts '''
     class WindowsSlowProcess(MockProcess):
         ''' Simulate Windows process that's slow to terminate '''
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+            self._join_call_count = 0
+
         def join(self, timeout=None):
+            ''' Mock process join for Windows slow termination '''
             # On Windows, simulate that termination takes longer
-            if timeout and timeout >= 7:  # Our Windows timeout
+            # First call (graceful shutdown with 8s timeout) - process stays alive
+            # Second call (after terminate, with 7s timeout) - process dies
+            self._join_call_count += 1
+
+            if self._join_call_count == 1:
+                # First call - graceful shutdown fails, process stays alive
+                pass
+            elif self._join_call_count >= 2 and timeout and timeout >= 7:
+                # Second call after terminate - process dies
                 self._alive = False
-            # If timeout is too short, process stays alive
 
     mock_process = WindowsSlowProcess(name='trackpoll')
     subprocess_manager.processes['trackpoll']['process'] = mock_process