3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix tests

Browse source
This commit is contained in:
Lipu Fei 2019-01-18 13:00:34 +01:00
parent a51289d7ce
commit c83f815838
4 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/GlobalStacksModel.py
View file

@ -1,17 +1,13 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import pyqtProperty, Qt
from UM.Qt.ListModel import ListModel from UM.Qt.ListModel import ListModel
from PyQt5.QtCore import pyqtProperty, Qt, pyqtSignal
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Settings.ContainerStack import ContainerStack
from cura.PrinterOutputDevice import ConnectionType from cura.PrinterOutputDevice import ConnectionType
from cura.Settings.GlobalStack import GlobalStack
class GlobalStacksModel(ListModel): class GlobalStacksModel(ListModel):
NameRole = Qt.UserRole + 1 NameRole = Qt.UserRole + 1
@ -38,6 +34,8 @@ class GlobalStacksModel(ListModel):
## Handler for container added/removed events from registry ## Handler for container added/removed events from registry
def _onContainerChanged(self, container): def _onContainerChanged(self, container):
from cura.Settings.GlobalStack import GlobalStack # otherwise circular imports
# We only need to update when the added / removed container GlobalStack # We only need to update when the added / removed container GlobalStack
if isinstance(container, GlobalStack): if isinstance(container, GlobalStack):
self._update() self._update()

4
plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py
View file

@ -1,7 +1,6 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import os
from PyQt5.QtCore import QUrl from PyQt5.QtCore import QUrl
from PyQt5.QtGui import QDesktopServices from PyQt5.QtGui import QDesktopServices
@ -13,8 +12,6 @@ from UM.Logger import Logger
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
from cura.Settings.GlobalStack import GlobalStack
from .FirmwareUpdateCheckerJob import FirmwareUpdateCheckerJob from .FirmwareUpdateCheckerJob import FirmwareUpdateCheckerJob
from .FirmwareUpdateCheckerMessage import FirmwareUpdateCheckerMessage from .FirmwareUpdateCheckerMessage import FirmwareUpdateCheckerMessage
@ -53,6 +50,7 @@ class FirmwareUpdateChecker(Extension):
def _onContainerAdded(self, container): def _onContainerAdded(self, container):
# Only take care when a new GlobalStack was added # Only take care when a new GlobalStack was added
from cura.Settings.GlobalStack import GlobalStack # otherwise circular imports
if isinstance(container, GlobalStack): if isinstance(container, GlobalStack):
self.checkFirmwareVersion(container, True) self.checkFirmwareVersion(container, True)

7
plugins/FirmwareUpdateChecker/tests/TestFirmwareUpdateChecker.py
View file

@ -7,8 +7,7 @@ from unittest.mock import MagicMock
from UM.Version import Version from UM.Version import Version
from plugins.FirmwareUpdateChecker.FirmwareUpdateCheckerJob import FirmwareUpdateCheckerJob import FirmwareUpdateChecker
from plugins.FirmwareUpdateChecker.FirmwareUpdateCheckerLookup import FirmwareUpdateCheckerLookup
json_data = \ json_data = \
{ {
@ -44,7 +43,7 @@ json_data = \
("emmerson", 5), ("emmerson", 5),
]) ])
def test_FirmwareUpdateCheckerLookup(id, name): def test_FirmwareUpdateCheckerLookup(id, name):
lookup = FirmwareUpdateCheckerLookup(name, json_data.get(name)) lookup = FirmwareUpdateChecker.FirmwareUpdateCheckerLookup.FirmwareUpdateCheckerLookup(name, json_data.get(name))
assert lookup.getMachineName() == name assert lookup.getMachineName() == name
assert lookup.getMachineId() == id assert lookup.getMachineId() == id
@ -58,6 +57,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, MagicMock) job = FirmwareUpdateChecker.FirmwareUpdateCheckerJob.FirmwareUpdateCheckerJob(False, name, machine_data, MagicMock)
job.getUrlResponse = MagicMock(return_value = str(version)) # Pretend like we got a good response from the server job.getUrlResponse = MagicMock(return_value = str(version)) # Pretend like we got a good response from the server
assert job.getCurrentVersion() == version assert job.getCurrentVersion() == version

0
plugins/FirmwareUpdateChecker/tests/__init__.py Normal file
View file