소스 검색

AMBARI-7464. Make stack_advisor code more human readable - unit test fixes (srimanth)

Srimanth Gunturi 11 년 전
부모
커밋
c202098079
2개의 변경된 파일6개의 추가작업 그리고 11개의 파일을 삭제
  1. 0 5
      ambari-server/.pydevproject
  2. 6 6
      ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py

+ 0 - 5
ambari-server/.pydevproject

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>

+ 6 - 6
ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py

@@ -235,7 +235,7 @@ class TestHDP206StackAdvisor(TestCase):
     ]
     ]
     self.assertValidationResult(expectedItems, result)
     self.assertValidationResult(expectedItems, result)
 
 
-  def test_getClusterData_withHBaseAnd6gbRam(self):
+  def test_getConfigurationClusterSummary_withHBaseAnd6gbRam(self):
     servicesList = ["HBASE"]
     servicesList = ["HBASE"]
     components = []
     components = []
     hosts = {
     hosts = {
@@ -275,11 +275,11 @@ class TestHDP206StackAdvisor(TestCase):
       "amMemory": 512
       "amMemory": 512
     }
     }
 
 
-    result = self.stackAdvisor.getClusterData(servicesList, hosts, components)
+    result = self.stackAdvisor.getConfigurationClusterSummary(servicesList, hosts, components)
 
 
     self.assertEquals(result, expected)
     self.assertEquals(result, expected)
 
 
-  def test_getClusterData_withHBaseAnd48gbRam(self):
+  def test_getConfigurationClusterSummary_withHBaseAnd48gbRam(self):
     servicesList = ["HBASE"]
     servicesList = ["HBASE"]
     components = []
     components = []
     hosts = {
     hosts = {
@@ -317,7 +317,7 @@ class TestHDP206StackAdvisor(TestCase):
       "amMemory": 3072
       "amMemory": 3072
     }
     }
 
 
-    result = self.stackAdvisor.getClusterData(servicesList, hosts, components)
+    result = self.stackAdvisor.getConfigurationClusterSummary(servicesList, hosts, components)
 
 
     self.assertEquals(result, expected)
     self.assertEquals(result, expected)
 
 
@@ -364,13 +364,13 @@ class TestHDP206StackAdvisor(TestCase):
     self.stackAdvisor.recommendMapReduce2Configurations(configurations, clusterData)
     self.stackAdvisor.recommendMapReduce2Configurations(configurations, clusterData)
     self.assertEquals(configurations, expected)
     self.assertEquals(configurations, expected)
 
 
-  def test_getClusterData_noHostsWithoutHBase(self):
+  def test_getConfigurationClusterSummary_noHostsWithoutHBase(self):
     servicesList = []
     servicesList = []
     components = []
     components = []
     hosts = {
     hosts = {
       "items" : []
       "items" : []
     }
     }
-    result = self.stackAdvisor.getClusterData(servicesList, hosts, components)
+    result = self.stackAdvisor.getConfigurationClusterSummary(servicesList, hosts, components)
 
 
     expected = {
     expected = {
       "hBaseInstalled": False,
       "hBaseInstalled": False,