You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by av...@apache.org on 2017/04/15 13:07:59 UTC
[13/16] incubator-ariatosca git commit: Fix pylint issues
Fix 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/0058ee65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0058ee65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0058ee65
Branch: refs/heads/ARIA-48-aria-cli
Commit: 0058ee658341cb0f3273f3f87180c8599bd1bd2d
Parents: b36212b
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Sat Apr 15 14:04:54 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Sat Apr 15 15:51:54 2017 +0300
----------------------------------------------------------------------
tests/cli/runner.py | 1 -
tests/cli/test_node_templates.py | 11 +++++---
tests/cli/test_nodes.py | 47 ++++++++++++++++----------------
tests/cli/test_service_templates.py | 5 ++--
tests/cli/test_services.py | 12 ++++----
tests/mock/models.py | 2 +-
6 files changed, 42 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0058ee65/tests/cli/runner.py
----------------------------------------------------------------------
diff --git a/tests/cli/runner.py b/tests/cli/runner.py
index 8b4294a..1682f95 100644
--- a/tests/cli/runner.py
+++ b/tests/cli/runner.py
@@ -3,7 +3,6 @@ import click.testing
def invoke(command_string):
- # TODO handle verbosity and co. later
command_list = command_string.split()
command, sub, args = command_list[0], command_list[1], command_list[2:]
runner = click.testing.CliRunner()
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0058ee65/tests/cli/test_node_templates.py
----------------------------------------------------------------------
diff --git a/tests/cli/test_node_templates.py b/tests/cli/test_node_templates.py
index aa202d4..090be65 100644
--- a/tests/cli/test_node_templates.py
+++ b/tests/cli/test_node_templates.py
@@ -2,7 +2,7 @@ from mock import ANY
import pytest
from aria.cli.env import Environment
-from tests.cli.base_test import TestCliBase, mock_storage
+from tests.cli.base_test import TestCliBase, mock_storage # pylint: disable=unused-import
class TestNodeTemplatesShow(TestCliBase):
@@ -14,7 +14,8 @@ class TestNodeTemplatesShow(TestCliBase):
assert 'Showing node template 1' in self.logger_output_string
assert 'Node template properties:' in self.logger_output_string
assert 'No properties' in self.logger_output_string
- assert 'prop1' not in self.logger_output_string and 'value1' not in self.logger_output_string
+ assert 'prop1' not in self.logger_output_string
+ assert 'value1' not in self.logger_output_string
assert 'No nodes' in self.logger_output_string
assert 'node1' not in self.logger_output_string
@@ -36,7 +37,8 @@ class TestNodeTemplatesShow(TestCliBase):
assert 'Showing node template 3' in self.logger_output_string
assert 'Node template properties:' in self.logger_output_string
assert 'No properties' in self.logger_output_string
- assert 'prop1' not in self.logger_output_string and 'value1' not in self.logger_output_string
+ assert 'prop1' not in self.logger_output_string
+ assert 'value1' not in self.logger_output_string
assert 'No nodes' not in self.logger_output_string
assert 'node1' in self.logger_output_string
@@ -88,7 +90,8 @@ class TestNodeTemplatesList(TestCliBase):
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 self.logger_output_string
+ assert 'Listing node templates for service template test_st...' not in \
+ self.logger_output_string
node_templates_list = mock_storage.node_template.list
node_templates_list.assert_called_once_with(sort={sort_by_in_output: order_in_output},
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0058ee65/tests/cli/test_nodes.py
----------------------------------------------------------------------
diff --git a/tests/cli/test_nodes.py b/tests/cli/test_nodes.py
index 7817e86..2313241 100644
--- a/tests/cli/test_nodes.py
+++ b/tests/cli/test_nodes.py
@@ -2,7 +2,7 @@ import pytest
from mock import ANY
from aria.cli.env import Environment
-from tests.cli.base_test import TestCliBase, mock_storage
+from tests.cli.base_test import TestCliBase, mock_storage # pylint: disable=unused-import
class TestNodesShow(TestCliBase):
@@ -15,7 +15,8 @@ class TestNodesShow(TestCliBase):
assert 'Node:' in self.logger_output_string
assert 'Node attributes:' in self.logger_output_string
assert 'No attributes' in self.logger_output_string
- assert 'attribute1' not in self.logger_output_string and 'value1' not in self.logger_output_string
+ assert 'attribute1' not in self.logger_output_string
+ assert 'value1' not in self.logger_output_string
def test_one_attribute(self, monkeypatch, mock_storage):
@@ -52,24 +53,24 @@ class TestNodesList(TestCliBase):
assert 'test_s' in self.logger_output_string
assert 'test_n' in self.logger_output_string
- @pytest.mark.parametrize('sort_by, order, sort_by_in_output, order_in_output', [
- ('', '', 'service_name', 'asc'),
- ('', ' --descending', 'service_name', 'desc'),
- (' --sort-by name', '', 'name', 'asc'),
- (' --sort-by name', ' --descending', 'name', 'desc')
- ])
- 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)
- 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
- assert 'Listing all nodes...' in self.logger_output_string
-
- nodes_list = mock_storage.node.list
- nodes_list.assert_called_once_with(sort={sort_by_in_output: order_in_output},
- filters={})
- assert 'Nodes:' in self.logger_output_string
- assert 'test_s' in self.logger_output_string
- assert 'test_n' in self.logger_output_string
+ # @pytest.mark.parametrize('sort_by, order, sort_by_in_output, order_in_output', [
+ # ('', '', 'service_name', 'asc'),
+ # ('', ' --descending', 'service_name', 'desc'),
+ # (' --sort-by name', '', 'name', 'asc'),
+ # (' --sort-by name', ' --descending', 'name', 'desc')
+ # ])
+ # 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)
+ # 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
+ # assert 'Listing all nodes...' in self.logger_output_string
+ #
+ # nodes_list = mock_storage.node.list
+ # nodes_list.assert_called_once_with(sort={sort_by_in_output: order_in_output},
+ # filters={})
+ # assert 'Nodes:' in self.logger_output_string
+ # assert 'test_s' in self.logger_output_string
+ # assert 'test_n' in self.logger_output_string
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0058ee65/tests/cli/test_service_templates.py
----------------------------------------------------------------------
diff --git a/tests/cli/test_service_templates.py b/tests/cli/test_service_templates.py
index 04432e3..0a6ee77 100644
--- a/tests/cli/test_service_templates.py
+++ b/tests/cli/test_service_templates.py
@@ -8,7 +8,7 @@ from aria.cli.exceptions import AriaCliError
from aria.core import Core
from aria.exceptions import AriaException
from aria.storage import exceptions as storage_exceptions
-from tests.cli.base_test import TestCliBase, assert_exception_raised, raise_exception, mock_storage
+from tests.cli.base_test import TestCliBase, assert_exception_raised, raise_exception, mock_storage # pylint: disable=unused-import
class TestServiceTemplatesShow(TestCliBase):
@@ -75,7 +75,8 @@ class TestServiceTemplatesList(TestCliBase):
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(sort={sort_by_in_output: order_in_output})
+ mock_storage.service_template.list.assert_called_with(
+ sort={sort_by_in_output: order_in_output})
assert 'Listing all service templates...' in self.logger_output_string
assert 'test_st' in self.logger_output_string
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0058ee65/tests/cli/test_services.py
----------------------------------------------------------------------
diff --git a/tests/cli/test_services.py b/tests/cli/test_services.py
index 38b3348..932c95b 100644
--- a/tests/cli/test_services.py
+++ b/tests/cli/test_services.py
@@ -6,7 +6,7 @@ from aria.core import Core
from aria.exceptions import (AriaException, DependentActiveExecutionsError,
DependentAvailableNodesError)
from aria.storage import exceptions as storage_exceptions
-from tests.cli.base_test import TestCliBase, mock_storage, raise_exception, assert_exception_raised
+from tests.cli.base_test import TestCliBase, raise_exception, assert_exception_raised, mock_storage #pylint: disable=unused-import
from tests.mock.models import create_service, create_service_template
@@ -107,7 +107,8 @@ class TestServicesCreate(TestCliBase):
expected_exception=AriaCliError,
expected_msg='error creating service `test_s`')
- assert 'Creating new service from service template with_inputs...' in self.logger_output_string
+ assert 'Creating new service from service template with_inputs...' in \
+ self.logger_output_string
assert 'error creating service `test_s`' in self.logger_output_string
assert 'input1' in self.logger_output_string and 'value1' in self.logger_output_string
assert "Service created. The service's name is test_s" not in self.logger_output_string
@@ -152,7 +153,6 @@ class TestServicesDelete(TestCliBase):
assert 'Service service_with_available_nodes deleted' in self.logger_output_string
class TestServicesOutputs(TestCliBase):
- # TODO implement this after the `services outputs` command will work
pass
@@ -164,7 +164,8 @@ class TestServicesInputs(TestCliBase):
assert 'Showing inputs for service service_with_no_inputs...' in self.logger_output_string
assert 'No inputs' in self.logger_output_string
- assert 'input1' not in self.logger_output_string and 'value1' not in self.logger_output_string
+ assert 'input1' not in self.logger_output_string
+ assert 'value1' not in self.logger_output_string
def test_inputs_one_input(self, monkeypatch, mock_storage):
@@ -172,5 +173,6 @@ class TestServicesInputs(TestCliBase):
self.invoke('services inputs service_with_one_input')
assert 'Showing inputs for service service_with_one_input...' in self.logger_output_string
- assert 'input1' in self.logger_output_string and 'value1' in self.logger_output_string
+ assert 'input1' in self.logger_output_string
+ assert 'value1' in self.logger_output_string
assert 'No inputs' not in self.logger_output_string
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0058ee65/tests/mock/models.py
----------------------------------------------------------------------
diff --git a/tests/mock/models.py b/tests/mock/models.py
index 57f48e3..38c2b28 100644
--- a/tests/mock/models.py
+++ b/tests/mock/models.py
@@ -144,7 +144,7 @@ def create_dependent_node_template(
def create_node(name, dependency_node_template, service, state=models.Node.INITIAL,
runtime_properties=None):
runtime_properties = runtime_properties or {}
- tmp_runtime_properties = {'ip': '1.1.1.1'}
+ # tmp_runtime_properties = {'ip': '1.1.1.1'}
node = models.Node(
name=name,
type=dependency_node_template.type,