Repository: ambari Updated Branches: refs/heads/trunk c2f2320ca -> 5c99c9b07
AMBARI-12799 Python unittest fail when java exists (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c99c9b0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c99c9b0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c99c9b0 Branch: refs/heads/trunk Commit: 5c99c9b0766d99cf3f3a26a0fe0f493a478deec4 Parents: c2f2320 Author: Dmytro Sen <[email protected]> Authored: Tue Aug 18 12:25:59 2015 +0300 Committer: Dmytro Sen <[email protected]> Committed: Tue Aug 18 12:25:59 2015 +0300 ---------------------------------------------------------------------- .../python/stacks/2.0.6/hooks/before-ANY/test_before_any.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5c99c9b0/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py index 7bac523..368eb68 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py @@ -22,14 +22,16 @@ from stacks.utils.RMFTestCase import * from mock.mock import MagicMock, call, patch from resource_management import Hook import getpass +import os @patch.object(Hook, "run_custom_hook", new = MagicMock()) class TestHookBeforeInstall(RMFTestCase): TMP_PATH = '/tmp/hbase-hbase' + @patch("os.path.isfile") @patch.object(getpass, "getuser", new = MagicMock(return_value='some_user')) @patch("os.path.exists") - def test_hook_default(self, os_path_exists_mock): + def test_hook_default(self, os_path_exists_mock, os_path_isfile_mock): def side_effect(path): if path == "/etc/hadoop/conf": @@ -37,6 +39,7 @@ class TestHookBeforeInstall(RMFTestCase): return False os_path_exists_mock.side_effect = side_effect + os_path_isfile_mock.side_effect = [False, True, True, True, True] self.executeScript("2.0.6/hooks/before-ANY/scripts/hook.py", classname="BeforeAnyHook",
