AMBARI-7464. Make stack_advisor code more human readable - unit test fixes (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2020980 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2020980 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2020980 Branch: refs/heads/branch-alerts-dev Commit: c2020980791134aef2500ede142c265759faf0de Parents: a539800 Author: Srimanth Gunturi <[email protected]> Authored: Thu Sep 25 17:09:13 2014 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Thu Sep 25 17:09:18 2014 -0700 ---------------------------------------------------------------------- ambari-server/.pydevproject | 5 ----- .../python/stacks/2.0.6/common/test_stack_advisor.py | 12 ++++++------ 2 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c2020980/ambari-server/.pydevproject ---------------------------------------------------------------------- diff --git a/ambari-server/.pydevproject b/ambari-server/.pydevproject deleted file mode 100644 index 40e9f40..0000000 --- a/ambari-server/.pydevproject +++ /dev/null @@ -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> http://git-wip-us.apache.org/repos/asf/ambari/blob/c2020980/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py index ce15609..7b241fb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py +++ b/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) - def test_getClusterData_withHBaseAnd6gbRam(self): + def test_getConfigurationClusterSummary_withHBaseAnd6gbRam(self): servicesList = ["HBASE"] components = [] hosts = { @@ -275,11 +275,11 @@ class TestHDP206StackAdvisor(TestCase): "amMemory": 512 } - result = self.stackAdvisor.getClusterData(servicesList, hosts, components) + result = self.stackAdvisor.getConfigurationClusterSummary(servicesList, hosts, components) self.assertEquals(result, expected) - def test_getClusterData_withHBaseAnd48gbRam(self): + def test_getConfigurationClusterSummary_withHBaseAnd48gbRam(self): servicesList = ["HBASE"] components = [] hosts = { @@ -317,7 +317,7 @@ class TestHDP206StackAdvisor(TestCase): "amMemory": 3072 } - result = self.stackAdvisor.getClusterData(servicesList, hosts, components) + result = self.stackAdvisor.getConfigurationClusterSummary(servicesList, hosts, components) self.assertEquals(result, expected) @@ -364,13 +364,13 @@ class TestHDP206StackAdvisor(TestCase): self.stackAdvisor.recommendMapReduce2Configurations(configurations, clusterData) self.assertEquals(configurations, expected) - def test_getClusterData_noHostsWithoutHBase(self): + def test_getConfigurationClusterSummary_noHostsWithoutHBase(self): servicesList = [] components = [] hosts = { "items" : [] } - result = self.stackAdvisor.getClusterData(servicesList, hosts, components) + result = self.stackAdvisor.getConfigurationClusterSummary(servicesList, hosts, components) expected = { "hBaseInstalled": False,
