You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/08/12 15:52:49 UTC

ambari git commit: AMBARI-12282. Unit Test fix.Ambari JDK8 upgrade does not deploy JDK8 on DataNodes/NodeManager on rerun of setup.(vbrodetskyi)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 06dee693f -> 3fef050a0


AMBARI-12282. Unit Test fix.Ambari JDK8 upgrade does not deploy JDK8 on DataNodes/NodeManager on rerun of setup.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3fef050a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3fef050a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3fef050a

Branch: refs/heads/branch-2.1
Commit: 3fef050a0c84c744fdd3a57f1e01606a82c06b2d
Parents: 06dee69
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Aug 12 16:53:01 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Aug 12 16:53:01 2015 +0300

----------------------------------------------------------------------
 .../test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3fef050a/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 3eba8c7..37a52df 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
@@ -21,11 +21,13 @@ limitations under the License.
 from stacks.utils.RMFTestCase import *
 from mock.mock import MagicMock, call, patch
 from resource_management import Hook
+import getpass
 
 @patch.object(Hook, "run_custom_hook", new = MagicMock())
 class TestHookBeforeInstall(RMFTestCase):
   TMP_PATH = '/tmp/hbase-hbase'
 
+  @patch.object(getpass, "getuser", new = MagicMock(return_value='some_user'))
   @patch("os.path.exists")
   def test_hook_default(self, os_path_exists_mock):
 
@@ -205,7 +207,7 @@ class TestHookBeforeInstall(RMFTestCase):
     self.assertResourceCalled('Execute', ('chgrp', '-R', u'hadoop', u'/usr/jdk64/jdk1.7.0_45'),
                               sudo = True,
                               )
-    self.assertResourceCalled('Execute', ('chown', '-R', 'root', u'/usr/jdk64/jdk1.7.0_45'),
+    self.assertResourceCalled('Execute', ('chown', '-R', 'some_user', u'/usr/jdk64/jdk1.7.0_45'),
                               sudo = True,
                               )