From 4def062fe252359d9d980f76af07f553d69f0fb5 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Mon, 8 Aug 2022 10:51:32 -0500 Subject: [PATCH] Addon Manager: Improve unit tests for utlility --- .../AddonManager/AddonManagerTest/gui/test_workers_startup.py | 3 ++- .../AddonManager/AddonManagerTest/gui/test_workers_utility.py | 2 ++ src/Mod/AddonManager/addonmanager_workers_utility.py | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_startup.py b/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_startup.py index e6b636abe3..1b58384829 100644 --- a/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_startup.py +++ b/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_startup.py @@ -22,6 +22,7 @@ # * * # *************************************************************************** +import json import unittest import os import tempfile @@ -55,7 +56,7 @@ class TestWorkersStartup(unittest.TestCase): # Populated when the addon list is created in the first test self.package_cache = {} - self.macro_cache = {} + self.macro_cache = [] self.package_cache_file = tempfile.NamedTemporaryFile(mode='w', encoding="utf-8", delete=False) self.macro_cache_file = tempfile.NamedTemporaryFile(mode='w', encoding="utf-8", delete=False) diff --git a/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_utility.py b/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_utility.py index 0c97c554e7..45890c76e8 100644 --- a/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_utility.py +++ b/src/Mod/AddonManager/AddonManagerTest/gui/test_workers_utility.py @@ -53,6 +53,7 @@ class TestWorkersUtility(unittest.TestCase): worker.start() while worker.isRunning(): QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents, 50) + QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents) self.assertEqual(self.last_result,"SUCCESS") def test_connection_checker_thread_interrupt(self): @@ -64,6 +65,7 @@ class TestWorkersUtility(unittest.TestCase): worker.requestInterruption() while worker.isRunning(): QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents, 50) + QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents) self.assertIsNone(self.last_result, "Requesting interruption of thread failed to interrupt") def connection_succeeded(self): diff --git a/src/Mod/AddonManager/addonmanager_workers_utility.py b/src/Mod/AddonManager/addonmanager_workers_utility.py index 23e2971998..12a7700338 100644 --- a/src/Mod/AddonManager/addonmanager_workers_utility.py +++ b/src/Mod/AddonManager/addonmanager_workers_utility.py @@ -45,6 +45,7 @@ class ConnectionChecker(QtCore.QThread): FreeCAD.Console.PrintLog("Checking network connection...\n") result = self.check_network_connection() if QtCore.QThread.currentThread().isInterruptionRequested(): + FreeCAD.Console.PrintLog("Connection check cancelled\n") return if not result: self.failure.emit(