ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-13745 Unit test test_recommendAmsConfigurations fails (dsen)
Date Thu, 05 Nov 2015 16:06:01 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c62f44163 -> ab16f4178


AMBARI-13745 Unit test test_recommendAmsConfigurations fails (dsen)


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

Branch: refs/heads/trunk
Commit: ab16f41780639b1a1e38061dfd172f7bea77265e
Parents: c62f441
Author: Dmytro Sen <dsen@apache.org>
Authored: Thu Nov 5 18:05:47 2015 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Thu Nov 5 18:05:47 2015 +0200

----------------------------------------------------------------------
 .../python/stacks/2.1/TEZ/test_service_check.py   | 18 ++++++++++--------
 .../stacks/2.2/common/test_stack_advisor.py       |  6 +++---
 2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ab16f417/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
index 5b3d9f4..d037af4 100644
--- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
@@ -37,15 +37,17 @@ class TestTezServiceCheck(RMFTestCase):
         content = 'foo\nbar\nfoo\nbar\nfoo',
         mode = 0755,
     )
+
     self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeoutput',
-      security_enabled = False,
-      hadoop_bin_dir = '/usr/bin',
-      keytab = UnknownConfigurationMock(),
-      kinit_path_local = '/usr/bin/kinit',
-      user = 'hdfs',
-      hadoop_conf_dir = '/etc/hadoop/conf',
-      type = 'directory',
-      action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
+        security_enabled = False,
+        hadoop_bin_dir = '/usr/bin',
+        keytab = UnknownConfigurationMock(),
+        kinit_path_local = '/usr/bin/kinit',
+        user = 'hdfs',
+        dfs_type = '',
+        hadoop_conf_dir = '/etc/hadoop/conf',
+        type = 'directory',
+        action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'],
principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
     )
 
     self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput',

http://git-wip-us.apache.org/repos/asf/ambari/blob/ab16f417/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index a5a588f..6592489 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2152,7 +2152,7 @@ class TestHDP22StackAdvisor(TestCase):
     # Embedded mode, 4096m master heapsize, some splitpoints recommended
     services["configurations"]['ams-hbase-env']['properties']['hbase_master_heapsize'] =
'4096'
     expected['ams-site']['properties']['timeline.metrics.host.aggregate.splitpoints'] = \
-      'jvm.JvmMetrics.MemHeapCommittedM,regionserver.Server.Increment_median'
+      'master.Server.numDeadRegionServers'
     expected['ams-site']['properties']['timeline.metrics.cluster.aggregate.splitpoints']
= ' '
     expected['ams-hbase-env']['properties']['hbase_master_heapsize'] = '4096'
     self.stackAdvisor.recommendAmsConfigurations(configurations, clusterData, services, hosts)
@@ -2162,7 +2162,7 @@ class TestHDP22StackAdvisor(TestCase):
     services["configurations"]['ams-hbase-env']['properties']['hbase_master_heapsize'] =
'8192'
     expected['ams-hbase-env']['properties']['hbase_master_heapsize'] = '8192'
     self.stackAdvisor.recommendAmsConfigurations(configurations, clusterData, services, hosts)
-    self.assertEquals(len(configurations['ams-site']['properties']['timeline.metrics.host.aggregate.splitpoints'].split(',')),
10)
+    self.assertEquals(len(configurations['ams-site']['properties']['timeline.metrics.host.aggregate.splitpoints'].split(',')),
9)
     self.assertEquals(len(configurations['ams-site']['properties']['timeline.metrics.cluster.aggregate.splitpoints'].split(',')),
2)
 
     # Test splitpoints, AMS distributed mode
@@ -2193,7 +2193,7 @@ class TestHDP22StackAdvisor(TestCase):
     services["configurations"]['ams-hbase-env']['properties']['hbase_regionserver_heapsize']
= '8192'
     expected['ams-hbase-env']['properties']['hbase_regionserver_heapsize'] = '8192'
     self.stackAdvisor.recommendAmsConfigurations(configurations, clusterData, services, hosts)
-    self.assertEquals(len(configurations['ams-site']['properties']['timeline.metrics.host.aggregate.splitpoints'].split(',')),
10)
+    self.assertEquals(len(configurations['ams-site']['properties']['timeline.metrics.host.aggregate.splitpoints'].split(',')),
9)
     self.assertEquals(len(configurations['ams-site']['properties']['timeline.metrics.cluster.aggregate.splitpoints'].split(',')),
2)
 
   def test_recommendHbaseConfigurations(self):


Mime
View raw message