Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2021-05-10 17:53:16 +0300
committerJaime van Kessel <nallath@gmail.com>2021-05-10 17:53:16 +0300
commit2d396a81c5ec12df43a0ca3263ac7ecfd7e83828 (patch)
treeb619f9f4f58c2ba6826ba73d41ba9c44529a0d52 /tests
parent08e2687c1469413eaad378dd533ad6fa40a4177e (diff)
Remove unneeded pycapsule imports
Diffstat (limited to 'tests')
-rw-r--r--tests/conftest.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 1b9b1c47ce..efe9141e29 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,12 +6,7 @@
from unittest.mock import MagicMock, patch
import pytest
-# Prevents error: "PyCapsule_GetPointer called with incorrect name" with conflicting SIP configurations between Arcus and PyQt: Import custom Sip bindings first!
-import Savitar # Dont remove this line
-import Arcus # No really. Don't. It needs to be there!
-import pynest2d # Really!
from UM.Qt.QtApplication import QtApplication # QtApplication import is required, even though it isn't used.
-# Even though your IDE says these files are not used, don't believe it. It's lying. They need to be there.
from cura.CuraApplication import CuraApplication
from cura.Settings.ExtruderManager import ExtruderManager
@@ -19,6 +14,7 @@ from cura.Settings.MachineManager import MachineManager
from cura.UI.MachineActionManager import MachineActionManager
from UM.Settings.ContainerRegistry import ContainerRegistry
+
# Create a CuraApplication object that will be shared among all tests. It needs to be initialized.
# Since we need to use it more that once, we create the application the first time and use its instance afterwards.
@pytest.fixture()
@@ -26,15 +22,18 @@ def application() -> CuraApplication:
app = MagicMock()
return app
+
# Returns a MachineActionManager instance.
@pytest.fixture()
def machine_action_manager(application) -> MachineActionManager:
return MachineActionManager(application)
+
@pytest.fixture()
def global_stack():
return MagicMock(name="Global Stack")
+
@pytest.fixture()
def container_registry(application, global_stack) -> ContainerRegistry:
result = MagicMock()
@@ -42,6 +41,7 @@ def container_registry(application, global_stack) -> ContainerRegistry:
application.getContainerRegistry = MagicMock(return_value = result)
return result
+
@pytest.fixture()
def extruder_manager(application, container_registry) -> ExtruderManager:
if ExtruderManager.getInstance() is not None: