Ver código fonte

AMBARI-6971. Tests with ulimit are failing randomly (aonishuk)

Andrew Onishuk 10 anos atrás
pai
commit
d39b0e2cc3

+ 1 - 4
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py

@@ -24,10 +24,7 @@ import os
 config = Script.get_config()
 tmp_dir = Script.get_tmp_dir()
 
-if System.get_instance().os_type == "oraclelinux":
-  ulimit_cmd = ''
-else:
-  ulimit_cmd = "ulimit -c unlimited; "
+ulimit_cmd = "ulimit -c unlimited; "
 
 #security params
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']

+ 1 - 4
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py

@@ -24,10 +24,7 @@ import os
 config = Script.get_config()
 tmp_dir = Script.get_tmp_dir()
 
-if System.get_instance().os_type == "oraclelinux":
-  ulimit_cmd = ''
-else:
-  ulimit_cmd = "ulimit -c unlimited; "
+ulimit_cmd = "ulimit -c unlimited; "
 
 #security params
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']

+ 0 - 1
ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py

@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestDatanode(RMFTestCase):
 
   def test_configure_default(self):

+ 0 - 1
ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py

@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestNamenode(RMFTestCase):
 
   def test_configure_default(self):

+ 0 - 1
ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py

@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestSNamenode(RMFTestCase):
 
   def test_configure_default(self):

+ 0 - 1
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py

@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestDatanode(RMFTestCase):
 
   def test_configure_default(self):

+ 0 - 1
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py

@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestJournalnode(RMFTestCase):
 
   def test_configure_default(self):

+ 0 - 1
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py

@@ -26,7 +26,6 @@ import resource_management
 import subprocess
 
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestNamenode(RMFTestCase):
 
   def test_configure_default(self):

+ 0 - 1
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py

@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestSNamenode(RMFTestCase):
 
   def test_configure_default(self):

+ 0 - 1
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py

@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestZkfc(RMFTestCase):
 
   def test_start_default(self):