Browse Source

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

Vitaly Brodetskyi 10 years ago
parent
commit
46caf1b9b2

+ 3 - 1
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 stacks.utils.RMFTestCase import *
 from mock.mock import MagicMock, call, patch
 from mock.mock import MagicMock, call, patch
 from resource_management import Hook
 from resource_management import Hook
+import getpass
 
 
 @patch.object(Hook, "run_custom_hook", new = MagicMock())
 @patch.object(Hook, "run_custom_hook", new = MagicMock())
 class TestHookBeforeInstall(RMFTestCase):
 class TestHookBeforeInstall(RMFTestCase):
   TMP_PATH = '/tmp/hbase-hbase'
   TMP_PATH = '/tmp/hbase-hbase'
 
 
+  @patch.object(getpass, "getuser", new = MagicMock(return_value='some_user'))
   @patch("os.path.exists")
   @patch("os.path.exists")
   def test_hook_default(self, os_path_exists_mock):
   def test_hook_default(self, os_path_exists_mock):
 
 
@@ -200,7 +202,7 @@ class TestHookBeforeInstall(RMFTestCase):
     self.assertResourceCalled('Execute', ('chgrp', '-R', u'hadoop', u'/usr/jdk64/jdk1.7.0_45'),
     self.assertResourceCalled('Execute', ('chgrp', '-R', u'hadoop', u'/usr/jdk64/jdk1.7.0_45'),
                               sudo = True,
                               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,
                               sudo = True,
                               )
                               )