mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-06-04 11:14:21 +08:00
Refactor out unnecesary late init (to make tests cleaner). [UnitTests]
This commit is contained in:
parent
3dd355976b
commit
69e2fa396e
@ -32,7 +32,7 @@ class FirmwareUpdateCheckerJob(Job):
|
|||||||
|
|
||||||
self._machine_name = machine_name
|
self._machine_name = machine_name
|
||||||
self._metadata = metadata
|
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.
|
self._headers = {} # type:Dict[str, str] # Don't set headers yet.
|
||||||
|
|
||||||
def getUrlResponse(self, url: str) -> str:
|
def getUrlResponse(self, url: str) -> str:
|
||||||
@ -69,9 +69,6 @@ class FirmwareUpdateCheckerJob(Job):
|
|||||||
return max_version
|
return max_version
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
if self._lookups is None:
|
|
||||||
self._lookups = FirmwareUpdateCheckerLookup(self._machine_name, self._metadata)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Initialize a Preference that stores the last version checked for this printer.
|
# Initialize a Preference that stores the last version checked for this printer.
|
||||||
Application.getInstance().getPreferences().addPreference(
|
Application.getInstance().getPreferences().addPreference(
|
||||||
|
@ -64,7 +64,6 @@ def test_FirmwareUpdateCheckerLookup(id, name):
|
|||||||
def test_FirmwareUpdateCheckerJob_getCurrentVersion(name, version):
|
def test_FirmwareUpdateCheckerJob_getCurrentVersion(name, version):
|
||||||
machine_data = json_data.get(name)
|
machine_data = json_data.get(name)
|
||||||
job = FirmwareUpdateCheckerJob(False, name, machine_data, dummyCallback)
|
job = FirmwareUpdateCheckerJob(False, name, machine_data, dummyCallback)
|
||||||
job._lookups = FirmwareUpdateCheckerLookup(name, machine_data)
|
|
||||||
job._headers = {"User-Agent": "Cura-UnitTests 0"}
|
job._headers = {"User-Agent": "Cura-UnitTests 0"}
|
||||||
|
|
||||||
assert job.getCurrentVersion() == version
|
assert job.getCurrentVersion() == version
|
||||||
|
Loading…
x
Reference in New Issue
Block a user