Change Environment to _Environment
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/d2953788 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/d2953788 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/d2953788 Branch: refs/heads/cli-tests Commit: d2953788eefca44c27bcbb5df63b251b6a49ade3 Parents: 68c814e Author: Avia Efrat <[email protected]> Authored: Sat Apr 15 15:50:56 2017 +0300 Committer: Avia Efrat <[email protected]> Committed: Sat Apr 15 15:56:15 2017 +0300 ---------------------------------------------------------------------- tests/cli/test_node_templates.py | 14 +++++++------- tests/cli/test_nodes.py | 10 +++++----- tests/cli/test_service_templates.py | 22 +++++++++++----------- tests/cli/test_services.py | 26 +++++++++++++------------- 4 files changed, 36 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d2953788/tests/cli/test_node_templates.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_node_templates.py b/tests/cli/test_node_templates.py index fbf784c..f0ad539 100644 --- a/tests/cli/test_node_templates.py +++ b/tests/cli/test_node_templates.py @@ -1,7 +1,7 @@ from mock import ANY import pytest -from aria.cli.env import _Environment as Environment +from aria.cli.env import _Environment from tests.cli.base_test import TestCliBase, mock_storage # pylint: disable=unused-import @@ -9,7 +9,7 @@ class TestNodeTemplatesShow(TestCliBase): def test_no_properties_no_nodes(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('node_templates show 1') assert 'Showing node template 1' in self.logger_output_string assert 'Node template properties:' in self.logger_output_string @@ -21,7 +21,7 @@ class TestNodeTemplatesShow(TestCliBase): def test_one_property_no_nodes(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('node_templates show 2') assert 'Showing node template 2' in self.logger_output_string assert 'Node template properties:' in self.logger_output_string @@ -32,7 +32,7 @@ class TestNodeTemplatesShow(TestCliBase): def test_no_properties_one_node(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('node_templates show 3') assert 'Showing node template 3' in self.logger_output_string assert 'Node template properties:' in self.logger_output_string @@ -44,7 +44,7 @@ class TestNodeTemplatesShow(TestCliBase): def test_one_property_one_node(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('node_templates show 4') assert 'Showing node template 4' in self.logger_output_string assert 'Node template properties:' in self.logger_output_string @@ -65,7 +65,7 @@ class TestNodeTemplatesList(TestCliBase): def test_list_specified_service_template(self, monkeypatch, mock_storage, sort_by, order, sort_by_in_output, order_in_output): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('node_templates list -t test_st{sort_by}{order}'.format(sort_by=sort_by, order=order)) assert 'Listing node templates for service template test_st...' in self.logger_output_string @@ -87,7 +87,7 @@ class TestNodeTemplatesList(TestCliBase): def test_list_no_specified_service_template(self, monkeypatch, mock_storage, sort_by, order, sort_by_in_output, order_in_output): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('node_templates list{sort_by}{order}'.format(sort_by=sort_by, order=order)) assert 'Listing all node templates...' in self.logger_output_string assert 'Listing node templates for service template test_st...' not in \ http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d2953788/tests/cli/test_nodes.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_nodes.py b/tests/cli/test_nodes.py index 74e551e..9be97ca 100644 --- a/tests/cli/test_nodes.py +++ b/tests/cli/test_nodes.py @@ -1,7 +1,7 @@ import pytest from mock import ANY -from aria.cli.env import _Environment as Environment +from aria.cli.env import _Environment from tests.cli.base_test import TestCliBase, mock_storage # pylint: disable=unused-import @@ -9,7 +9,7 @@ class TestNodesShow(TestCliBase): def test_no_attributes(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('nodes show 1') assert 'Showing node 1' in self.logger_output_string assert 'Node:' in self.logger_output_string @@ -20,7 +20,7 @@ class TestNodesShow(TestCliBase): def test_one_attribute(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('nodes show 2') assert 'Showing node 2' in self.logger_output_string assert 'Node:' in self.logger_output_string @@ -40,7 +40,7 @@ class TestNodesList(TestCliBase): def test_list_specified_service(self, monkeypatch, mock_storage, sort_by, order, sort_by_in_output, order_in_output): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('nodes list -s test_s{sort_by}{order}'.format(sort_by=sort_by, order=order)) assert 'Listing nodes for service test_s...' in self.logger_output_string @@ -62,7 +62,7 @@ class TestNodesList(TestCliBase): def test_list_no_specified_service(self, monkeypatch, mock_storage, sort_by, order, sort_by_in_output, order_in_output): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('nodes list{sort_by}{order}'.format(sort_by=sort_by, order=order)) assert 'Listing nodes for service test_s...' not in self.logger_output_string http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d2953788/tests/cli/test_service_templates.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_service_templates.py b/tests/cli/test_service_templates.py index 83ee35a..ef70c37 100644 --- a/tests/cli/test_service_templates.py +++ b/tests/cli/test_service_templates.py @@ -1,7 +1,7 @@ import pytest from aria.cli import service_template_utils, csar -from aria.cli.env import _Environment as Environment +from aria.cli.env import _Environment from aria.cli.exceptions import AriaCliError from aria.core import Core from aria.exceptions import AriaException @@ -13,7 +13,7 @@ class TestServiceTemplatesShow(TestCliBase): def test_show_no_services_no_description(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('service_templates show no_services_no_description') assert 'Showing service template no_services_no_description...' in self.logger_output_string @@ -22,7 +22,7 @@ class TestServiceTemplatesShow(TestCliBase): def test_show_no_services_yes_description(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('service_templates show no_services_yes_description') assert 'Showing service template no_services_yes_description...' in \ @@ -32,7 +32,7 @@ class TestServiceTemplatesShow(TestCliBase): def test_show_one_service_no_description(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('service_templates show one_service_no_description') assert 'Showing service template one_service_no_description...' in self.logger_output_string @@ -41,7 +41,7 @@ class TestServiceTemplatesShow(TestCliBase): def test_show_one_service_yes_description(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('service_templates show one_service_yes_description') assert 'Showing service template one_service_yes_description...' in \ @@ -61,7 +61,7 @@ class TestServiceTemplatesList(TestCliBase): def test_all_sorting_combinations(self, monkeypatch, mock_storage, sort_by, order, sort_by_in_output, order_in_output): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('service_templates list{sort_by}{order}'.format(sort_by=sort_by, order=order)) mock_storage.service_template.list.assert_called_with( @@ -76,7 +76,7 @@ class TestServiceTemplatesStore(TestCliBase): monkeypatch.setattr(Core, 'create_service_template', mock_object) monkeypatch.setattr(service_template_utils, 'get', mock_object) - outcome = self.invoke('service_templates store stubpath test_st') + self.invoke('service_templates store stubpath test_st') assert 'Storing service template test_st...' in self.logger_output_string assert 'Service template test_st stored' in self.logger_output_string @@ -112,7 +112,7 @@ class TestServiceTemplatesDelete(TestCliBase): def test_delete_no_exception(self, monkeypatch, mock_object): - monkeypatch.setattr(Environment, 'model_storage', mock_object) + monkeypatch.setattr(_Environment, 'model_storage', mock_object) monkeypatch.setattr(Core, 'delete_service_template', mock_object) self.invoke('service_templates delete test_st') assert 'Deleting service template test_st...' in self.logger_output_string @@ -120,7 +120,7 @@ class TestServiceTemplatesDelete(TestCliBase): def test_delete_raises_exception(self, monkeypatch, mock_object): - monkeypatch.setattr(Environment, 'model_storage', mock_object) + monkeypatch.setattr(_Environment, 'model_storage', mock_object) monkeypatch.setattr(Core, 'delete_service_template', raise_exception(storage_exceptions.NotFoundError)) @@ -135,13 +135,13 @@ class TestServiceTemplatesDelete(TestCliBase): class TestServiceTemplatesInputs(TestCliBase): def test_inputs_existing_inputs(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('service_templates inputs with_inputs') assert 'Showing inputs for service template with_inputs...' in self.logger_output_string assert 'input1' in self.logger_output_string and 'value1' in self.logger_output_string def test_inputs_no_inputs(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('service_templates inputs without_inputs') assert 'Showing inputs for service template without_inputs...' in self.logger_output_string assert 'No inputs' in self.logger_output_string http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/d2953788/tests/cli/test_services.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_services.py b/tests/cli/test_services.py index f22fe88..116e449 100644 --- a/tests/cli/test_services.py +++ b/tests/cli/test_services.py @@ -1,7 +1,7 @@ import pytest from mock import ANY from aria.cli.exceptions import AriaCliError -from aria.cli.env import _Environment as Environment +from aria.cli.env import _Environment from aria.core import Core from aria.exceptions import (AriaException, DependentActiveExecutionsError, DependentAvailableNodesError) @@ -21,7 +21,7 @@ class TestServicesList(TestCliBase): def test_list_no_specified_service_template(self, monkeypatch, mock_storage, sort_by, order, sort_by_in_output, order_in_output): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('services list{sort_by}{order}'.format(sort_by=sort_by, order=order)) assert 'Listing all services...' in self.logger_output_string assert 'Listing services for service template' not in self.logger_output_string @@ -41,7 +41,7 @@ class TestServicesList(TestCliBase): def test_list_specified_service_template(self, monkeypatch, mock_storage, sort_by, order, sort_by_in_output, order_in_output): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('services list -t test_st{sort_by}{order}'.format(sort_by=sort_by, order=order)) assert 'Listing services for service template test_st...' in self.logger_output_string assert 'Listing all services...' not in self.logger_output_string @@ -57,7 +57,7 @@ class TestServicesCreate(TestCliBase): def test_create_no_exception(self, monkeypatch, mock_object): - monkeypatch.setattr(Environment, 'model_storage', mock_object) + monkeypatch.setattr(_Environment, 'model_storage', mock_object) test_st = create_service_template('test_st') mock_object.return_value = create_service(test_st, 'test_s') @@ -69,7 +69,7 @@ class TestServicesCreate(TestCliBase): def test_store_raises_storage_error_resulting_from_name_uniqueness(self, monkeypatch, mock_object): - monkeypatch.setattr(Environment, 'model_storage', mock_object) + monkeypatch.setattr(_Environment, 'model_storage', mock_object) monkeypatch.setattr(Core, 'create_service', raise_exception(storage_exceptions.NotFoundError, @@ -84,7 +84,7 @@ class TestServicesCreate(TestCliBase): assert "Service created. The service's name is test_s" not in self.logger_output_string def test_store_raises_other_storage_error(self, monkeypatch, mock_object): - monkeypatch.setattr(Environment, 'model_storage', mock_object) + monkeypatch.setattr(_Environment, 'model_storage', mock_object) monkeypatch.setattr(Core, 'create_service', raise_exception(storage_exceptions.NotFoundError)) @@ -97,7 +97,7 @@ class TestServicesCreate(TestCliBase): assert "Service created. The service's name is test_s" not in self.logger_output_string def test_store_raises_aria_exception(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) monkeypatch.setattr(Core, 'create_service', raise_exception(AriaException, msg='error creating service `test_s`')) @@ -118,14 +118,14 @@ class TestServicesDelete(TestCliBase): def test_delete_no_exception(self, monkeypatch, mock_object): - monkeypatch.setattr(Environment, 'model_storage', mock_object) + monkeypatch.setattr(_Environment, 'model_storage', mock_object) monkeypatch.setattr(Core, 'delete_service', mock_object) self.invoke('services delete test_s') assert 'Deleting service test_s...' in self.logger_output_string assert 'Service test_s deleted' in self.logger_output_string def test_delete_active_execution_error(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) assert_exception_raised( self.invoke('services delete service_with_active_executions'), expected_exception=DependentActiveExecutionsError, @@ -135,7 +135,7 @@ class TestServicesDelete(TestCliBase): assert 'Deleting service service_with_active_executions...' in self.logger_output_string def test_delete_available_nodes_error(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) assert_exception_raised( self.invoke('services delete service_with_available_nodes'), expected_exception=DependentAvailableNodesError, @@ -145,7 +145,7 @@ class TestServicesDelete(TestCliBase): assert 'Deleting service service_with_available_nodes...' in self.logger_output_string def test_delete_available_nodes_error_with_force(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('services delete service_with_available_nodes --force') assert mock_storage.service.delete.call_count == 1 @@ -159,7 +159,7 @@ class TestServicesOutputs(TestCliBase): class TestServicesInputs(TestCliBase): def test_inputs_no_inputs(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('services inputs service_with_no_inputs') assert 'Showing inputs for service service_with_no_inputs...' in self.logger_output_string @@ -169,7 +169,7 @@ class TestServicesInputs(TestCliBase): def test_inputs_one_input(self, monkeypatch, mock_storage): - monkeypatch.setattr(Environment, 'model_storage', mock_storage) + monkeypatch.setattr(_Environment, 'model_storage', mock_storage) self.invoke('services inputs service_with_one_input') assert 'Showing inputs for service service_with_one_input...' in self.logger_output_string
