Repository: ambari Updated Branches: refs/heads/trunk a9cc53a9e -> 56ff1abdb
AMBARI-6833. Fix unitests for issue - AMBARI-6748 Nimbus start failed after deployment (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/56ff1abd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/56ff1abd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/56ff1abd Branch: refs/heads/trunk Commit: 56ff1abdbfcef2491531a0bdbf29ff907144e9d5 Parents: a9cc53a Author: Andrew Onishuk <[email protected]> Authored: Wed Aug 13 18:06:50 2014 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Wed Aug 13 18:08:00 2014 +0300 ---------------------------------------------------------------------- .../STORM/package/scripts/yaml_config.py | 7 ++- .../stacks/2.1/STORM/test_storm_drpc_server.py | 48 +++++++++++--------- .../stacks/2.1/STORM/test_storm_nimbus.py | 30 ++++++------ .../stacks/2.1/STORM/test_storm_nimbus_prod.py | 30 ++++++------ .../2.1/STORM/test_storm_rest_api_service.py | 30 ++++++------ .../stacks/2.1/STORM/test_storm_supervisor.py | 30 ++++++------ .../2.1/STORM/test_storm_supervisor_prod.py | 32 +++++++------ .../stacks/2.1/STORM/test_storm_ui_server.py | 30 ++++++------ .../src/test/python/stacks/utils/RMFTestCase.py | 9 ++-- 9 files changed, 141 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/yaml_config.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/yaml_config.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/yaml_config.py index 39261be..d25089c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/yaml_config.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/yaml_config.py @@ -50,6 +50,10 @@ def escape_yaml_propetry(value): return value +def yaml_inline_template(configurations): + return source.InlineTemplate('''{% for key, value in configurations_dict.items() %}{{ key }}: {{ escape_yaml_propetry(value) }} +{% endfor %}''', configurations_dict=configurations, extra_imports=[escape_yaml_propetry]) + def yaml_config( filename, configurations = None, @@ -58,8 +62,7 @@ def yaml_config( owner = None, group = None ): - config_content = source.InlineTemplate('''{% for key, value in configurations_dict.items() %}{{ key }}: {{ escape_yaml_propetry(value) }} -{% endfor %}''', configurations_dict=configurations, extra_imports=[escape_yaml_propetry]) + config_content = yaml_inline_template(configurations) File (format("{conf_dir}/{filename}"), content = config_content, http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py index c07ce72..b182462 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py @@ -22,11 +22,9 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import resource_management.core.source [email protected](resource_management.core.source, "InlineTemplate", new = MagicMock(return_value='InlineTemplateMock')) -#@patch("resource_management.core.source.InlineTemplate.__repr__", new=lambda x: '\'InlineTemplateMock\'') class TestStormDrpcServer(RMFTestCase): - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py", classname = "DrpcServer", command = "configure", @@ -36,7 +34,7 @@ class TestStormDrpcServer(RMFTestCase): self.assert_configure_default() self.assertNoMoreResources() - def _test_start_default(self): + def test_start_default(self): self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py", classname = "DrpcServer", @@ -60,7 +58,7 @@ class TestStormDrpcServer(RMFTestCase): self.assertNoMoreResources() - def _test_stop_default(self): + def test_stop_default(self): self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py", classname = "DrpcServer", command = "stop", @@ -76,7 +74,7 @@ class TestStormDrpcServer(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/drpc.pid') self.assertNoMoreResources() - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py", classname = "DrpcServer", command = "configure", @@ -85,7 +83,7 @@ class TestStormDrpcServer(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - def _test_start_secured(self): + def test_start_secured(self): self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py", classname = "DrpcServer", command = "start", @@ -109,7 +107,7 @@ class TestStormDrpcServer(RMFTestCase): self.assertNoMoreResources() - def _test_stop_secured(self): + def test_stop_secured(self): self.executeScript("2.1/services/STORM/package/scripts/drpc_server.py", classname = "DrpcServer", command = "stop", @@ -125,7 +123,7 @@ class TestStormDrpcServer(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/drpc.pid') self.assertNoMoreResources() - def _assert_configure_default(self): + def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', @@ -154,16 +152,17 @@ class TestStormDrpcServer(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) - #self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', - # owner = 'stcorm', - # content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']), - # ) + self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', + owner = 'storm', + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']), + ) - def _assert_configure_secured(self): + + def assert_configure_secured(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', @@ -192,12 +191,19 @@ class TestStormDrpcServer(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) - #self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', - # content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']), - # owner = 'stkorm', - # ) - + self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', + content=InlineTemplate(self.getConfig()['configurations']['storm-env']['content']), + owner='storm', + ) + self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf', + owner='storm', + ) + + def get_yaml_inline_template(self, configurations): + with self.env: + from yaml_config import yaml_inline_template + return yaml_inline_template(configurations) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py index 5658d62..da0ea19 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py @@ -22,10 +22,9 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import resource_management.core.source [email protected](resource_management.core.source, "InlineTemplate", new = MagicMock(return_value='InlineTemplateMock')) class TestStormNimbus(RMFTestCase): - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus.py", classname = "Nimbus", command = "configure", @@ -34,7 +33,7 @@ class TestStormNimbus(RMFTestCase): self.assert_configure_default() self.assertNoMoreResources() - def _test_start_default(self): + def test_start_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus.py", classname = "Nimbus", command = "start", @@ -58,7 +57,7 @@ class TestStormNimbus(RMFTestCase): self.assertNoMoreResources() - def _test_stop_default(self): + def test_stop_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus.py", classname = "Nimbus", command = "stop", @@ -74,7 +73,7 @@ class TestStormNimbus(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/nimbus.pid') self.assertNoMoreResources() - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus.py", classname = "Nimbus", command = "configure", @@ -83,7 +82,7 @@ class TestStormNimbus(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - def _test_start_secured(self): + def test_start_secured(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus.py", classname = "Nimbus", command = "start", @@ -107,7 +106,7 @@ class TestStormNimbus(RMFTestCase): self.assertNoMoreResources() - def _test_stop_secured(self): + def test_stop_secured(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus.py", classname = "Nimbus", command = "stop", @@ -123,7 +122,7 @@ class TestStormNimbus(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/nimbus.pid') self.assertNoMoreResources() - def _assert_configure_default(self): + def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', @@ -152,16 +151,16 @@ class TestStormNimbus(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) - def _assert_configure_secured(self): + def assert_configure_secured(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -189,14 +188,19 @@ class TestStormNimbus(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf', owner = 'storm', ) + + def get_yaml_inline_template(self, configurations): + with self.env: + from yaml_config import yaml_inline_template + return yaml_inline_template(configurations) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py index 158fdc1..0fe3564 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py @@ -22,10 +22,9 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import resource_management.core.source [email protected](resource_management.core.source, "InlineTemplate", new = MagicMock(return_value='InlineTemplateMock')) class TestStormNimbus(RMFTestCase): - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus_prod.py", classname = "Nimbus", command = "configure", @@ -34,7 +33,7 @@ class TestStormNimbus(RMFTestCase): self.assert_configure_default() self.assertNoMoreResources() - def _test_start_default(self): + def test_start_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus_prod.py", classname = "Nimbus", command = "start", @@ -48,7 +47,7 @@ class TestStormNimbus(RMFTestCase): self.assertNoMoreResources() - def _test_stop_default(self): + def test_stop_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus_prod.py", classname = "Nimbus", command = "stop", @@ -59,7 +58,7 @@ class TestStormNimbus(RMFTestCase): ) self.assertNoMoreResources() - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus_prod.py", classname = "Nimbus", command = "configure", @@ -68,7 +67,7 @@ class TestStormNimbus(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - def _test_start_secured(self): + def test_start_secured(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus_prod.py", classname = "Nimbus", command = "start", @@ -82,7 +81,7 @@ class TestStormNimbus(RMFTestCase): self.assertNoMoreResources() - def _test_stop_secured(self): + def test_stop_secured(self): self.executeScript("2.1/services/STORM/package/scripts/nimbus_prod.py", classname = "Nimbus", command = "stop", @@ -93,7 +92,7 @@ class TestStormNimbus(RMFTestCase): ) self.assertNoMoreResources() - def _assert_configure_default(self): + def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -121,16 +120,16 @@ class TestStormNimbus(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) - def _assert_configure_secured(self): + def assert_configure_secured(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -158,14 +157,19 @@ class TestStormNimbus(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf', owner = 'storm', ) + + def get_yaml_inline_template(self, configurations): + with self.env: + from yaml_config import yaml_inline_template + return yaml_inline_template(configurations) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py index 2684079..542830d 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py @@ -22,10 +22,9 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import resource_management.core.source [email protected](resource_management.core.source, "InlineTemplate", new = MagicMock(return_value='InlineTemplateMock')) class TestStormRestApi(RMFTestCase): - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/rest_api.py", classname = "StormRestApi", command = "configure", @@ -34,7 +33,7 @@ class TestStormRestApi(RMFTestCase): self.assert_configure_default() self.assertNoMoreResources() - def _test_start_default(self): + def test_start_default(self): self.executeScript("2.1/services/STORM/package/scripts/rest_api.py", classname = "StormRestApi", command = "start", @@ -58,7 +57,7 @@ class TestStormRestApi(RMFTestCase): self.assertNoMoreResources() - def _test_stop_default(self): + def test_stop_default(self): self.executeScript("2.1/services/STORM/package/scripts/rest_api.py", classname = "StormRestApi", command = "stop", @@ -74,7 +73,7 @@ class TestStormRestApi(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/restapi.pid') self.assertNoMoreResources() - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/rest_api.py", classname = "StormRestApi", command = "configure", @@ -83,7 +82,7 @@ class TestStormRestApi(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - def _test_start_secured(self): + def test_start_secured(self): self.executeScript("2.1/services/STORM/package/scripts/rest_api.py", classname = "StormRestApi", command = "start", @@ -107,7 +106,7 @@ class TestStormRestApi(RMFTestCase): self.assertNoMoreResources() - def _test_stop_secured(self): + def test_stop_secured(self): self.executeScript("2.1/services/STORM/package/scripts/rest_api.py", classname = "StormRestApi", command = "stop", @@ -123,7 +122,7 @@ class TestStormRestApi(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/restapi.pid') self.assertNoMoreResources() - def _assert_configure_default(self): + def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', @@ -152,16 +151,16 @@ class TestStormRestApi(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) - def _assert_configure_secured(self): + def assert_configure_secured(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -189,14 +188,19 @@ class TestStormRestApi(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf', owner = 'storm', ) + + def get_yaml_inline_template(self, configurations): + with self.env: + from yaml_config import yaml_inline_template + return yaml_inline_template(configurations) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py index 6faead0..4ab2b76 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py @@ -22,10 +22,9 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import resource_management.core.source [email protected](resource_management.core.source, "InlineTemplate", new = MagicMock(return_value='InlineTemplateMock')) class TestStormSupervisor(RMFTestCase): - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor.py", classname = "Supervisor", command = "configure", @@ -34,7 +33,7 @@ class TestStormSupervisor(RMFTestCase): self.assert_configure_default() self.assertNoMoreResources() - def _test_start_default(self): + def test_start_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor.py", classname = "Supervisor", command = "start", @@ -70,7 +69,7 @@ class TestStormSupervisor(RMFTestCase): self.assertNoMoreResources() - def _test_stop_default(self): + def test_stop_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor.py", classname = "Supervisor", command = "stop", @@ -94,7 +93,7 @@ class TestStormSupervisor(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid') self.assertNoMoreResources() - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor.py", classname = "Supervisor", command = "configure", @@ -103,7 +102,7 @@ class TestStormSupervisor(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - def _test_start_secured(self): + def test_start_secured(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor.py", classname = "Supervisor", command = "start", @@ -138,7 +137,7 @@ class TestStormSupervisor(RMFTestCase): ) self.assertNoMoreResources() - def _test_stop_secured(self): + def test_stop_secured(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor.py", classname = "Supervisor", command = "stop", @@ -162,7 +161,7 @@ class TestStormSupervisor(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid') self.assertNoMoreResources() - def _assert_configure_default(self): + def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', @@ -191,16 +190,16 @@ class TestStormSupervisor(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) - def _assert_configure_secured(self): + def assert_configure_secured(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -228,14 +227,19 @@ class TestStormSupervisor(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf', owner = 'storm', ) + + def get_yaml_inline_template(self, configurations): + with self.env: + from yaml_config import yaml_inline_template + return yaml_inline_template(configurations) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py index 574e7c2..5f32ff1 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py @@ -22,10 +22,9 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import resource_management.core.source [email protected](resource_management.core.source, "InlineTemplate", new = MagicMock(return_value='InlineTemplateMock')) class TestStormSupervisor(RMFTestCase): - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor_prod.py", classname = "Supervisor", command = "configure", @@ -34,7 +33,7 @@ class TestStormSupervisor(RMFTestCase): self.assert_configure_default() self.assertNoMoreResources() - def _test_start_default(self): + def test_start_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor_prod.py", classname = "Supervisor", command = "start", @@ -60,7 +59,7 @@ class TestStormSupervisor(RMFTestCase): self.assertNoMoreResources() - def _test_stop_default(self): + def test_stop_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor_prod.py", classname = "Supervisor", command = "stop", @@ -81,7 +80,7 @@ class TestStormSupervisor(RMFTestCase): self.assertNoMoreResources() - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor_prod.py", classname = "Supervisor", command = "configure", @@ -90,7 +89,7 @@ class TestStormSupervisor(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - def _test_start_secured(self): + def test_start_secured(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor_prod.py", classname = "Supervisor", command = "start", @@ -116,7 +115,7 @@ class TestStormSupervisor(RMFTestCase): self.assertNoMoreResources() - def _test_stop_secured(self): + def test_stop_secured(self): self.executeScript("2.1/services/STORM/package/scripts/supervisor_prod.py", classname = "Supervisor", command = "stop", @@ -138,7 +137,7 @@ class TestStormSupervisor(RMFTestCase): self.assertNoMoreResources() - def _assert_configure_default(self): + def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -166,16 +165,16 @@ class TestStormSupervisor(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) - def _assert_configure_secured(self): + def assert_configure_secured(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -203,14 +202,19 @@ class TestStormSupervisor(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf', owner = 'storm', - ) + ) + + def get_yaml_inline_template(self, configurations): + with self.env: + from yaml_config import yaml_inline_template + return yaml_inline_template(configurations) http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py index 1c5e755..b5101a5 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py @@ -22,10 +22,9 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import resource_management.core.source [email protected](resource_management.core.source, "InlineTemplate", new = MagicMock(return_value='InlineTemplateMock')) class TestStormUiServer(RMFTestCase): - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/ui_server.py", classname = "UiServer", command = "configure", @@ -34,7 +33,7 @@ class TestStormUiServer(RMFTestCase): self.assert_configure_default() self.assertNoMoreResources() - def _test_start_default(self): + def test_start_default(self): self.executeScript("2.1/services/STORM/package/scripts/ui_server.py", classname = "UiServer", command = "start", @@ -58,7 +57,7 @@ class TestStormUiServer(RMFTestCase): self.assertNoMoreResources() - def _test_stop_default(self): + def test_stop_default(self): self.executeScript("2.1/services/STORM/package/scripts/ui_server.py", classname = "UiServer", command = "stop", @@ -74,7 +73,7 @@ class TestStormUiServer(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/ui.pid') self.assertNoMoreResources() - def _test_configure_default(self): + def test_configure_default(self): self.executeScript("2.1/services/STORM/package/scripts/ui_server.py", classname = "UiServer", command = "configure", @@ -83,7 +82,7 @@ class TestStormUiServer(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - def _test_start_secured(self): + def test_start_secured(self): self.executeScript("2.1/services/STORM/package/scripts/ui_server.py", classname = "UiServer", command = "start", @@ -107,7 +106,7 @@ class TestStormUiServer(RMFTestCase): self.assertNoMoreResources() - def _test_stop_secured(self): + def test_stop_secured(self): self.executeScript("2.1/services/STORM/package/scripts/ui_server.py", classname = "UiServer", command = "stop", @@ -123,7 +122,7 @@ class TestStormUiServer(RMFTestCase): self.assertResourceCalled('Execute', 'rm -f /var/run/storm/ui.pid') self.assertNoMoreResources() - def _assert_configure_default(self): + def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', @@ -152,16 +151,16 @@ class TestStormUiServer(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) - def _assert_configure_secured(self): + def assert_configure_secured(self): self.assertResourceCalled('Directory', '/var/log/storm', owner = 'storm', group = 'hadoop', @@ -189,14 +188,19 @@ class TestStormUiServer(RMFTestCase): ) self.assertResourceCalled('File', '/etc/storm/conf/storm.yaml', owner = 'storm', - content = 'InlineTemplateMock', + content = self.get_yaml_inline_template(self.getConfig()['configurations']['storm-site']), group = 'hadoop', mode = None, ) self.assertResourceCalled('File', '/etc/storm/conf/storm-env.sh', owner = 'storm', - content = self.getConfig()['configurations']['storm-env']['content'] + content = InlineTemplate(self.getConfig()['configurations']['storm-env']['content']) ) self.assertResourceCalled('TemplateConfig', '/etc/storm/conf/storm_jaas.conf', owner = 'storm', ) + + def get_yaml_inline_template(self, configurations): + with self.env: + from yaml_config import yaml_inline_template + return yaml_inline_template(configurations) http://git-wip-us.apache.org/repos/asf/ambari/blob/56ff1abd/ambari-server/src/test/python/stacks/utils/RMFTestCase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py index 831c449..a59de73 100644 --- a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py +++ b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py @@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ''' -__all__ = ["RMFTestCase", "Template", "StaticFile", "InlineTemplate","UnknownConfigurationMock"] +__all__ = ["RMFTestCase", "Template", "StaticFile", "InlineTemplate", "UnknownConfigurationMock"] from unittest import TestCase import json @@ -27,6 +27,7 @@ import sys import pprint from mock.mock import MagicMock, patch import platform + with patch("platform.linux_distribution", return_value = ('Suse','11','Final')): from resource_management.core.environment import Environment from resource_management.libraries.script.config_dictionary import ConfigDictionary @@ -177,7 +178,8 @@ class RMFTestCase(TestCase): self.assertEquals(resource_type, resource.__class__.__name__) self.assertEquals(name, resource.name) self.assertEquals(kwargs, resource.arguments) - + + # HACK: This is used to check Templates, StaticFile, InlineTemplate in testcases def Template(name, **kwargs): with RMFTestCase.env: @@ -193,7 +195,8 @@ def InlineTemplate(name, **kwargs): with RMFTestCase.env: from resource_management.core.source import InlineTemplate return InlineTemplate(name, **kwargs) - + + class UnknownConfigurationMock(): def __eq__(self, other): return isinstance(other, UnknownConfiguration)
