diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2017-05-16 15:54:57 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2017-05-16 15:55:34 +0300 |
| commit | 121ebd79cf5e6a1ec9de7c4589545c386cf7d0da (patch) | |
| tree | fac8dfe5f7ac4635e8f453abe8d6f5e2d3f9d9d9 /tests | |
| parent | 50bda1c9dd9de04cd75fb59dc7da0f209e200d8d (diff) | |
Fix circular import problem caused by moving SettingVersion into CuraApplication
CURA-3756
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Settings/TestCuraContainerRegistry.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/Settings/TestCuraContainerRegistry.py b/tests/Settings/TestCuraContainerRegistry.py index ad79f74dd4..11e772c3b7 100644 --- a/tests/Settings/TestCuraContainerRegistry.py +++ b/tests/Settings/TestCuraContainerRegistry.py @@ -68,11 +68,12 @@ def test_addContainerGlobalStack(container_registry, definition_container): assert type(mock_super_add_container.call_args_list[0][0][0]) == GlobalStack def test_addContainerGoodSettingVersion(container_registry, definition_container): - definition_container.getMetaData()["setting_version"] = 3 + from cura.CuraApplication import CuraApplication + definition_container.getMetaData()["setting_version"] = CuraApplication.SettingVersion container_registry.addContainer(definition_container) instance = UM.Settings.InstanceContainer.InstanceContainer(container_id = "Test Instance") - instance.addMetaDataEntry("setting_version", 3) + instance.addMetaDataEntry("setting_version", CuraApplication.SettingVersion) instance.setDefinition(definition_container) mock_super_add_container = unittest.mock.MagicMock() #Take the role of the Uranium-ContainerRegistry where the resulting containers get registered. @@ -82,7 +83,8 @@ def test_addContainerGoodSettingVersion(container_registry, definition_container mock_super_add_container.assert_called_once_with(instance) #The instance must have been registered now. def test_addContainerNoSettingVersion(container_registry, definition_container): - definition_container.getMetaData()["setting_version"] = 3 + from cura.CuraApplication import CuraApplication + definition_container.getMetaData()["setting_version"] = CuraApplication.SettingVersion container_registry.addContainer(definition_container) instance = UM.Settings.InstanceContainer.InstanceContainer(container_id = "Test Instance") @@ -96,7 +98,8 @@ def test_addContainerNoSettingVersion(container_registry, definition_container): mock_super_add_container.assert_not_called() #Should not get passed on to UM.Settings.ContainerRegistry.addContainer, because the setting_version is interpreted as 0! def test_addContainerBadSettingVersion(container_registry, definition_container): - definition_container.getMetaData()["setting_version"] = 3 + from cura.CuraApplication import CuraApplication + definition_container.getMetaData()["setting_version"] = CuraApplication.SettingVersion container_registry.addContainer(definition_container) instance = UM.Settings.InstanceContainer.InstanceContainer(container_id = "Test Instance") |