Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-48-aria-cli 195597dba -> c16166c12
fixed pylint issues Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c16166c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c16166c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c16166c1 Branch: refs/heads/ARIA-48-aria-cli Commit: c16166c122e2939b934427375e00a4c97ee1bafe Parents: 195597d Author: Ran Ziv <[email protected]> Authored: Wed Apr 19 15:59:06 2017 +0300 Committer: Ran Ziv <[email protected]> Committed: Wed Apr 19 15:59:06 2017 +0300 ---------------------------------------------------------------------- aria/cli/commands/services.py | 2 +- tests/cli/test_node_templates.py | 4 ++-- tests/cli/test_nodes.py | 4 ++-- tests/cli/test_service_templates.py | 4 ++-- tests/cli/test_services.py | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c16166c1/aria/cli/commands/services.py ---------------------------------------------------------------------- diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py index 81bef7d..1aa99f3 100644 --- a/aria/cli/commands/services.py +++ b/aria/cli/commands/services.py @@ -19,9 +19,9 @@ from StringIO import StringIO from . import service_templates from .. import helptexts +from .. import table from .. import utils from ..core import aria -from ..table import print_data from ...core import Core from ...modeling import exceptions as modeling_exceptions from ...storage import exceptions as storage_exceptions http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c16166c1/tests/cli/test_node_templates.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_node_templates.py b/tests/cli/test_node_templates.py index 76f8820..ff7ff28 100644 --- a/tests/cli/test_node_templates.py +++ b/tests/cli/test_node_templates.py @@ -18,9 +18,9 @@ from mock import ANY, MagicMock from aria.cli.env import _Environment -from .base_test import ( +from .base_test import ( # pylint: disable=unused-import TestCliBase, - mock_storage # pylint: disable=unused-import + mock_storage ) from ..mock import models as mock_models http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c16166c1/tests/cli/test_nodes.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_nodes.py b/tests/cli/test_nodes.py index fbeb9dd..0233989 100644 --- a/tests/cli/test_nodes.py +++ b/tests/cli/test_nodes.py @@ -18,9 +18,9 @@ import mock from aria.cli.env import _Environment -from .base_test import ( +from .base_test import ( # pylint: disable=unused-import TestCliBase, - mock_storage # pylint: disable=unused-import + mock_storage ) from ..mock import models as mock_models http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c16166c1/tests/cli/test_service_templates.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_service_templates.py b/tests/cli/test_service_templates.py index 11bcf97..058853f 100644 --- a/tests/cli/test_service_templates.py +++ b/tests/cli/test_service_templates.py @@ -23,11 +23,11 @@ from aria.core import Core from aria.exceptions import AriaException from aria.storage import exceptions as storage_exceptions -from .base_test import ( +from .base_test import ( # pylint: disable=unused-import TestCliBase, assert_exception_raised, raise_exception, - mock_storage # pylint: disable=unused-import + mock_storage ) from ..mock import models as mock_models http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c16166c1/tests/cli/test_services.py ---------------------------------------------------------------------- diff --git a/tests/cli/test_services.py b/tests/cli/test_services.py index 2f87e04..d3da130 100644 --- a/tests/cli/test_services.py +++ b/tests/cli/test_services.py @@ -23,11 +23,11 @@ from aria.exceptions import (AriaException, DependentActiveExecutionsError, DependentAvailableNodesError) from aria.storage import exceptions as storage_exceptions -from .base_test import ( +from .base_test import ( # pylint: disable=unused-import TestCliBase, raise_exception, assert_exception_raised, - mock_storage #pylint: disable=unused-import + mock_storage ) from ..mock import models as mock_models @@ -157,8 +157,8 @@ class TestServicesDelete(TestCliBase): self.invoke('services delete test_s'), expected_exception=DependentActiveExecutionsError, expected_msg="Can't delete service {name} - there is an active execution " - "for this service. Active execution id: 1" - .format(name=mock_models.SERVICE_NAME)) + "for this service. Active execution id: 1".format( + name=mock_models.SERVICE_NAME)) def test_delete_available_nodes_error(self, monkeypatch, mock_storage): monkeypatch.setattr(_Environment, 'model_storage', mock_storage) @@ -166,8 +166,8 @@ class TestServicesDelete(TestCliBase): self.invoke('services delete test_s'), expected_exception=DependentAvailableNodesError, expected_msg="Can't delete service {name} - there are available nodes " - "for this service. Available node ids: 1" - .format(name=mock_models.SERVICE_NAME)) + "for this service. Available node ids: 1".format( + name=mock_models.SERVICE_NAME)) def test_delete_available_nodes_error_with_force(self, monkeypatch, mock_storage): monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
