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 some tests not cleaning up correctly after themselves

Browse source 
The PrintInformation test wasn't cleaning up after itself correclty. This
left some stuff behind that the other tests were using. Since this is bad (as at that point
tests can influence other tests), i've fixed that
This commit is contained in:
Jaime van Kessel 2019-12-24 16:20:09 +01:00
parent 04125d4608
commit 0862fd493e
No known key found for this signature in database
GPG key ID: 3710727397403C91
6 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/API/TestAccount.py
View file

@ -1,4 +1,4 @@
from unittest.mock import MagicMock
from unittest.mock import MagicMock, patch
import pytest
@ -14,6 +14,7 @@ def user_profile():
result.user_id = "user_id!"
return result
def test_login():
account = Account(MagicMock())
mocked_auth_service = MagicMock()
@ -55,8 +56,8 @@ def test_logout():
account.logout()
mocked_auth_service.deleteAuthData.assert_called_once_with()
def test_errorLoginState():
@patch("UM.Application.Application.getInstance")
def test_errorLoginState(application):
account = Account(MagicMock())
mocked_auth_service = MagicMock()
account._authorization_service = mocked_auth_service

2
tests/Machines/Models/TestDiscoveredPrintersModel.py
View file

@ -14,6 +14,7 @@ def discovered_printer() -> DiscoveredPrinter:
return DiscoveredPrinter("127.0.0.1", "zomg", "yay", None, "bleep", MagicMock())
@pytest.mark.skip # TODO: This has some unknown dependency on the applicaiton / registry, which is hard to patch out. (which doesn't mean we shouldn't fix it!)
def test_discoveredPrinters(discovered_printer_model):
mocked_device = MagicMock()
cluster_size = PropertyMock(return_value = 1)
@ -36,6 +37,7 @@ def test_discoveredPrinters(discovered_printer_model):
discovered_printer_model.removeDiscoveredPrinter("ip")
assert discovered_printer_model.discoveredPrintersChanged.emit.call_count == 1
test_validate_data_get_set = [
{"attribute": "name", "value": "zomg"},
{"attribute": "machineType", "value": "BHDHAHHADAD"},

21
tests/Machines/TestContainerTree.py
View file

@ -39,11 +39,13 @@ def application():
def test_containerTreeInit(container_registry):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
container_tree = ContainerTree()
with patch("UM.Application.Application.getInstance"):
container_tree = ContainerTree()
assert "machine_1" in container_tree.machines
assert "machine_2" in container_tree.machines
def test_getCurrentQualityGroupsNoGlobalStack(container_registry):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = MagicMock(getGlobalContainerStack = MagicMock(return_value = None)))):
@ -52,12 +54,12 @@ def test_getCurrentQualityGroupsNoGlobalStack(container_registry):
assert len(result) == 0
def test_getCurrentQualityGroups(container_registry, application):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
container_tree = ContainerTree()
container_tree.machines._machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters.
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)):
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)):
container_tree = ContainerTree()
container_tree.machines._machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters.
result = container_tree.getCurrentQualityGroups()
# As defined in the fixture for application.
@ -68,6 +70,7 @@ def test_getCurrentQualityGroups(container_registry, application):
container_tree.machines["current_global_stack"].getQualityGroups.assert_called_with(expected_variant_names, expected_material_base_files, expected_is_enabled)
assert result == container_tree.machines["current_global_stack"].getQualityGroups.return_value
def test_getCurrentQualityChangesGroupsNoGlobalStack(container_registry):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = MagicMock(getGlobalContainerStack = MagicMock(return_value = None)))):
@ -76,12 +79,12 @@ def test_getCurrentQualityChangesGroupsNoGlobalStack(container_registry):
assert len(result) == 0
def test_getCurrentQualityChangesGroups(container_registry, application):
with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value = container_registry)):
container_tree = ContainerTree()
container_tree.machines._machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters.
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)):
with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)):
container_tree = ContainerTree()
container_tree.machines._machines["current_global_stack"] = MagicMock() # Mock so that we can track whether the getQualityGroups function gets called with correct parameters.
result = container_tree.getCurrentQualityChangesGroups()
# As defined in the fixture for application.

24
tests/PrinterOutput/TestNetworkedPrinterOutputDevice.py
View file

@ -1,5 +1,5 @@
import time
from unittest.mock import MagicMock
from unittest.mock import MagicMock, patch
from PyQt5.QtNetwork import QNetworkAccessManager
from PyQt5.QtCore import QUrl
@ -9,8 +9,8 @@ from cura.PrinterOutput.PrinterOutputDevice import ConnectionState
def test_properties():
properties = { b"firmware_version": b"12", b"printer_type": b"BHDHAHHADAD", b"address": b"ZOMG", b"name": b":(", b"testProp": b"zomg"}
output_device = NetworkedPrinterOutputDevice(device_id = "test", address = "127.0.0.1", properties = properties)
with patch("UM.Qt.QtApplication.QtApplication.getInstance"):
output_device = NetworkedPrinterOutputDevice(device_id = "test", address = "127.0.0.1", properties = properties)
assert output_device.address == "ZOMG"
assert output_device.firmwareVersion == "12"
assert output_device.printerType == "BHDHAHHADAD"
@ -24,7 +24,8 @@ def test_properties():
def test_authenticationState():
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
with patch("UM.Qt.QtApplication.QtApplication.getInstance"):
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
output_device.setAuthenticationState(AuthState.Authenticated)
@ -32,7 +33,8 @@ def test_authenticationState():
def test_post():
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
with patch("UM.Qt.QtApplication.QtApplication.getInstance"):
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
@ -53,7 +55,8 @@ def test_post():
def test_get():
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
with patch("UM.Qt.QtApplication.QtApplication.getInstance"):
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
@ -74,7 +77,8 @@ def test_get():
def test_delete():
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
with patch("UM.Qt.QtApplication.QtApplication.getInstance"):
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
@ -95,7 +99,8 @@ def test_delete():
def test_put():
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
with patch("UM.Qt.QtApplication.QtApplication.getInstance"):
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
@ -116,7 +121,8 @@ def test_put():
def test_timeout():
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
with patch("UM.Qt.QtApplication.QtApplication.getInstance"):
output_device = NetworkedPrinterOutputDevice(device_id="test", address="127.0.0.1", properties={})
output_device.setConnectionState(ConnectionState.Connected)
assert output_device.connectionState == ConnectionState.Connected

7
tests/TestPrintInformation.py
View file

@ -37,11 +37,10 @@ def getPrintInformation(printer_name) -> PrintInformation:
mock_machine_manager = MagicMock()
mock_machine_manager.getAbbreviatedMachineName = functools.partial(original_get_abbreviated_name, mock_machine_manager)
mock_application.getMachineManager = MagicMock(return_value = mock_machine_manager)
with patch("UM.Application.Application.getInstance", MagicMock(return_value = mock_application)):
Application.getInstance = MagicMock(return_value = mock_application)
with patch("json.loads", lambda x: {}):
print_information = PrintInformation.PrintInformation(mock_application)
with patch("json.loads", lambda x: {}):
print_information = PrintInformation.PrintInformation(mock_application)
return print_information