diff --git a/plugins/PostProcessingPlugin/tests/TestPostProcessingPlugin.py b/plugins/PostProcessingPlugin/tests/TestPostProcessingPlugin.py index 241b7ef07d..a5ef9e47c9 100644 --- a/plugins/PostProcessingPlugin/tests/TestPostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/tests/TestPostProcessingPlugin.py @@ -3,8 +3,6 @@ import os import sys from unittest.mock import patch, MagicMock -from pytest import fixture - from UM.Resources import Resources from UM.Trust import Trust from ..PostProcessingPlugin import PostProcessingPlugin @@ -30,25 +28,17 @@ def test_community_bundled_script_allowed(): def test_enterprise_unsigned_user_script_not_allowed(): assert not PostProcessingPlugin._isScriptAllowed("blaat.py") -@fixture -def mocked_get_instance_or_none(): - mocked_trust = MagicMock() - mocked_trust.signedFileCheck = MagicMock(return_value=True) - return mocked_trust - -@fixture -def mocked_get_signature_file_exists_for(): - return MagicMock(return_value=True) - # noinspection PyProtectedMember @patch("cura.ApplicationMetadata.IsEnterpriseVersion", True) -@patch("UM.Trust", "signatureFileExistsFor") -@patch("UM.Trust.Trust.getInstanceOrNone") -def test_enterprise_signed_user_script_allowed(mocked_instance_or_none, mocked_get_instance_or_none): - file_path = "blaat.py" +def test_enterprise_signed_user_script_allowed(): + mocked_trust = MagicMock() + mocked_trust.signedFileCheck = MagicMock(return_value=True) + realSignatureFileExistsFor = Trust.signatureFileExistsFor Trust.signatureFileExistsFor = MagicMock(return_value=True) - assert PostProcessingPlugin._isScriptAllowed(file_path) + + with patch("UM.Trust.Trust.getInstanceOrNone", return_value=mocked_trust): + assert PostProcessingPlugin._isScriptAllowed("blaat.py") # cleanup Trust.signatureFileExistsFor = realSignatureFileExistsFor