Browse Source

Refactor out unnecesary late init (to make tests cleaner). [UnitTests]

Remco Burema 6 years ago
parent
commit
69e2fa396e

+ 1 - 4
plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -32,7 +32,7 @@ class FirmwareUpdateCheckerJob(Job):
 
         self._machine_name = machine_name
         self._metadata = metadata
-        self._lookups = None  # type:Optional[FirmwareUpdateCheckerLookup]
+        self._lookups = FirmwareUpdateCheckerLookup(self._machine_name, self._metadata)
         self._headers = {}  # type:Dict[str, str]  # Don't set headers yet.
 
     def getUrlResponse(self, url: str) -> str:
@@ -69,9 +69,6 @@ class FirmwareUpdateCheckerJob(Job):
         return max_version
 
     def run(self):
-        if self._lookups is None:
-            self._lookups = FirmwareUpdateCheckerLookup(self._machine_name, self._metadata)
-
         try:
             # Initialize a Preference that stores the last version checked for this printer.
             Application.getInstance().getPreferences().addPreference(

+ 0 - 1
plugins/FirmwareUpdateChecker/tests/TestFirmwareUpdateChecker.py

@@ -64,7 +64,6 @@ def test_FirmwareUpdateCheckerLookup(id, name):
 def test_FirmwareUpdateCheckerJob_getCurrentVersion(name, version):
     machine_data = json_data.get(name)
     job = FirmwareUpdateCheckerJob(False, name, machine_data, dummyCallback)
-    job._lookups = FirmwareUpdateCheckerLookup(name, machine_data)
     job._headers = {"User-Agent": "Cura-UnitTests 0"}
 
     assert job.getCurrentVersion() == version