From 69e2fa396e5e227751cf30c74df76e3a4fc3f188 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 16 Nov 2018 16:53:37 +0100 Subject: [PATCH] Refactor out unnecesary late init (to make tests cleaner). [UnitTests] --- plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py | 5 +---- .../FirmwareUpdateChecker/tests/TestFirmwareUpdateChecker.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py index 9192b9005c..b37de81f34 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py +++ b/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( diff --git a/plugins/FirmwareUpdateChecker/tests/TestFirmwareUpdateChecker.py b/plugins/FirmwareUpdateChecker/tests/TestFirmwareUpdateChecker.py index 7ccb2fdf6a..21d15922a2 100644 --- a/plugins/FirmwareUpdateChecker/tests/TestFirmwareUpdateChecker.py +++ b/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