Browse Source

Fix the failing tests

CURA-6255
Jaime van Kessel 5 years ago
parent
commit
9de2b39d38
1 changed files with 7 additions and 6 deletions
  1. 7 6
      tests/Settings/TestSettingVisibilityPresets.py

+ 7 - 6
tests/Settings/TestSettingVisibilityPresets.py

@@ -1,4 +1,4 @@
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch
 
 import os.path
 
@@ -28,8 +28,8 @@ def test_createVisibilityPresetFromLocalFile():
 
 def test_visibilityFromPrevious():
     # This test checks that all settings in basic are in advanced and all settings in advanced are in expert.
-
-    visibility_model = SettingVisibilityPresetsModel(Preferences())
+    with patch("cura.CuraApplication.CuraApplication.getInstance"):
+        visibility_model = SettingVisibilityPresetsModel(Preferences())
 
     basic_visibility = visibility_model.getVisibilityPresetById("basic")
     advanced_visibility = visibility_model.getVisibilityPresetById("advanced")
@@ -46,7 +46,8 @@ def test_visibilityFromPrevious():
 
 def test_setActivePreset():
     preferences = Preferences()
-    visibility_model = SettingVisibilityPresetsModel(preferences)
+    with patch("cura.CuraApplication.CuraApplication.getInstance"):
+        visibility_model = SettingVisibilityPresetsModel(preferences)
     visibility_model.activePresetChanged = MagicMock()
     # Ensure that we start off with basic (since we didn't change anyting just yet!)
     assert visibility_model.activePreset == "basic"
@@ -71,13 +72,13 @@ def test_preferenceChanged():
     preferences = Preferences()
     # Set the visible_settings to something silly
     preferences.addPreference("general/visible_settings", "omgzomg")
-    visibility_model = SettingVisibilityPresetsModel(preferences)
+    with patch("cura.CuraApplication.CuraApplication.getInstance"):
+        visibility_model = SettingVisibilityPresetsModel(preferences)
     visibility_model.activePresetChanged = MagicMock()
 
     assert visibility_model.activePreset == "custom"  # This should make the model start at "custom
     assert visibility_model.activePresetChanged.emit.call_count == 0
 
-
     basic_visibility = visibility_model.getVisibilityPresetById("basic")
     new_visibility_string = ";".join(basic_visibility.settings)
     preferences.setValue("general/visible_settings", new_visibility_string)