summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-23 03:44:46 +0000
committerGerrit Code Review <review@openstack.org>2016-09-23 03:44:46 +0000
commite768825090b130c3fec6ec658206a6cfeaaa68fd (patch)
tree4eea51c955403158ce2d7f49fae9a43bc2c2c48d
parentf39434315344be461aae36f96ff8d12fce9ab037 (diff)
parent590b3fb99635157a3963f67995593b872f92a1c1 (diff)
downloadheat-cfntools-e768825090b130c3fec6ec658206a6cfeaaa68fd.tar.gz
Merge "Replace 'MagicMock' with 'Mock'"
-rw-r--r--heat_cfntools/tests/test_cfn_helper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/heat_cfntools/tests/test_cfn_helper.py b/heat_cfntools/tests/test_cfn_helper.py
index d13324a..83bed76 100644
--- a/heat_cfntools/tests/test_cfn_helper.py
+++ b/heat_cfntools/tests/test_cfn_helper.py
@@ -82,7 +82,7 @@ class TestCommandRunner(testtools.TestCase):
def test_privileges_are_lowered_for_non_root_user(self, mock_geteuid,
mock_seteuid,
mock_getpwnam):
- pw_entry = mock.MagicMock()
+ pw_entry = mock.Mock()
pw_entry.pw_uid = 1001
mock_getpwnam.return_value = pw_entry
mock_geteuid.return_value = 0
@@ -114,7 +114,7 @@ class TestCommandRunner(testtools.TestCase):
def test_privileges_are_restored_for_command_failure(self, mock_geteuid,
mock_seteuid,
mock_getpwnam):
- pw_entry = mock.MagicMock()
+ pw_entry = mock.Mock()
pw_entry.pw_uid = 1001
mock_getpwnam.return_value = pw_entry
mock_geteuid.return_value = 0