From 4a49b5e5628fcf87b6ea573f303b3eeb7085e9e5 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 24 Aug 2014 21:27:08 +0200 Subject: [PATCH] Flake8: Fix E128 Fix and enable E128: E128 continuation line under-indented for visual indent Partial-Bug: #1333290 Change-Id: I72f673d291c388fc4df19e9585fb02e23c21fec3 --- .../api/share/admin/test_share_servers.py | 6 +++--- .../admin/test_share_servers_negative.py | 8 ++++--- .../test_volume_types_extra_specs_negative.py | 21 ++++++++++++------- contrib/tempest/tempest/config_share.py | 4 ++-- manila/share/drivers/netapp/cluster_mode.py | 6 ++++-- manila/tests/network/linux/test_ip_lib.py | 2 +- .../tests/scheduler/test_filter_scheduler.py | 3 ++- manila/tests/test_service.py | 2 +- tox.ini | 2 +- 9 files changed, 33 insertions(+), 21 deletions(-) diff --git a/contrib/tempest/tempest/api/share/admin/test_share_servers.py b/contrib/tempest/tempest/api/share/admin/test_share_servers.py index c703f6f7ae..c92627af20 100644 --- a/contrib/tempest/tempest/api/share/admin/test_share_servers.py +++ b/contrib/tempest/tempest/api/share/admin/test_share_servers.py @@ -33,7 +33,7 @@ class ShareServersAdminTest(base.BaseSharesAdminTest): super(ShareServersAdminTest, cls).setUpClass() if not CONF.share.multitenancy_enabled: msg = ("Share servers can be tested only with multitenant drivers." - " Skipping.") + " Skipping.") raise cls.skipException(msg) __, cls.share = cls.create_share() __, cls.share_network = cls.shares_client.get_share_network( @@ -93,7 +93,7 @@ class ShareServersAdminTest(base.BaseSharesAdminTest): if server["share_network_name"] in self.sn_name_and_id: if not server["host"]: msg = ("Server '%s' has wrong value for host - " - "'%s'.") % (server["id"], server["host"]) + "'%s'.") % (server["id"], server["host"]) raise exceptions.InvalidContentType(message=msg) host = server["host"] break @@ -119,7 +119,7 @@ class ShareServersAdminTest(base.BaseSharesAdminTest): if server["share_network_name"] in self.sn_name_and_id: if not server["status"]: msg = ("Server '%s' has wrong value for status - " - "'%s'.") % (server["id"], server["host"]) + "'%s'.") % (server["id"], server["host"]) raise exceptions.InvalidContentType(message=msg) status = server["status"] break diff --git a/contrib/tempest/tempest/api/share/admin/test_share_servers_negative.py b/contrib/tempest/tempest/api/share/admin/test_share_servers_negative.py index a2b192fe8c..5f24ad6d9e 100644 --- a/contrib/tempest/tempest/api/share/admin/test_share_servers_negative.py +++ b/contrib/tempest/tempest/api/share/admin/test_share_servers_negative.py @@ -31,17 +31,19 @@ class ShareServersNegativeAdminTest(base.BaseSharesAdminTest): @test.attr(type=["gate", "smoke", "negative", ]) def test_try_list_share_servers_with_member(self): self.assertRaises(exceptions.Unauthorized, - self.member_shares_client.list_share_servers) + self.member_shares_client.list_share_servers) @test.attr(type=["gate", "smoke", "negative", ]) def test_try_show_share_server_with_member(self): self.assertRaises(exceptions.Unauthorized, - self.member_shares_client.show_share_server, 'fake_id') + self.member_shares_client.show_share_server, + 'fake_id') @test.attr(type=["gate", "smoke", "negative", ]) def test_try_show_share_server_details_with_member(self): self.assertRaises(exceptions.Unauthorized, - self.member_shares_client.show_share_server_details, 'fake_id') + self.member_shares_client.show_share_server_details, + 'fake_id') @test.attr(type=["gate", "smoke", "negative", ]) def test_show_share_server_with_inexistent_id(self): diff --git a/contrib/tempest/tempest/api/share/admin/test_volume_types_extra_specs_negative.py b/contrib/tempest/tempest/api/share/admin/test_volume_types_extra_specs_negative.py index f8227981f7..8b2f83c88b 100644 --- a/contrib/tempest/tempest/api/share/admin/test_volume_types_extra_specs_negative.py +++ b/contrib/tempest/tempest/api/share/admin/test_volume_types_extra_specs_negative.py @@ -37,47 +37,54 @@ class ExtraSpecsAdminNegativeTest(base.BaseSharesAdminTest): @test.attr(type=["gate", "smoke", ]) def test_try_create_extra_specs_with_user(self): vt = self._create_volume_type() - self.assertRaises(exceptions.Unauthorized, + self.assertRaises( + exceptions.Unauthorized, self.member_shares_client.create_volume_type_extra_specs, vt["id"], {"key": "new_value"}) @test.attr(type=["gate", "smoke", ]) def test_try_list_extra_specs_with_user(self): vt = self._create_volume_type() - self.assertRaises(exceptions.Unauthorized, + self.assertRaises( + exceptions.Unauthorized, self.member_shares_client.list_volume_types_extra_specs, vt["id"]) @test.attr(type=["gate", "smoke", ]) def test_try_get_extra_spec_with_user(self): vt = self._create_volume_type() - self.assertRaises(exceptions.Unauthorized, + self.assertRaises( + exceptions.Unauthorized, self.member_shares_client.get_volume_type_extra_spec, vt["id"], "key") @test.attr(type=["gate", "smoke", ]) def test_try_get_extra_specs_with_user(self): vt = self._create_volume_type() - self.assertRaises(exceptions.Unauthorized, + self.assertRaises( + exceptions.Unauthorized, self.member_shares_client.get_volume_type_extra_specs, vt["id"]) @test.attr(type=["gate", "smoke", ]) def test_try_update_extra_spec_with_user(self): vt = self._create_volume_type() - self.assertRaises(exceptions.Unauthorized, + self.assertRaises( + exceptions.Unauthorized, self.member_shares_client.update_volume_type_extra_spec, vt["id"], "key", "new_value") @test.attr(type=["gate", "smoke", ]) def test_try_update_extra_specs_with_user(self): vt = self._create_volume_type() - self.assertRaises(exceptions.Unauthorized, + self.assertRaises( + exceptions.Unauthorized, self.member_shares_client.update_volume_type_extra_specs, vt["id"], {"key": "new_value"}) @test.attr(type=["gate", "smoke", ]) def test_try_delete_extra_specs_with_user(self): vt = self._create_volume_type() - self.assertRaises(exceptions.Unauthorized, + self.assertRaises( + exceptions.Unauthorized, self.member_shares_client.delete_volume_type_extra_spec, vt["id"], "key") diff --git a/contrib/tempest/tempest/config_share.py b/contrib/tempest/tempest/config_share.py index 783ecc7d63..a6a1a411ac 100644 --- a/contrib/tempest/tempest/config_share.py +++ b/contrib/tempest/tempest/config_share.py @@ -76,8 +76,8 @@ ShareGroup = [ help="Share network id, that will be used for shares" " in admin tenant. If not set, it won't be used"), cfg.BoolOpt("multi_backend", - default=False, - help="Runs Manila multi-backend tests."), + default=False, + help="Runs Manila multi-backend tests."), cfg.ListOpt("backend_names", default=[], help="Names of share backends, that will be used with " diff --git a/manila/share/drivers/netapp/cluster_mode.py b/manila/share/drivers/netapp/cluster_mode.py index b1f7f7c547..5f70a4bcfc 100644 --- a/manila/share/drivers/netapp/cluster_mode.py +++ b/manila/share/drivers/netapp/cluster_mode.py @@ -162,8 +162,10 @@ class NetAppClusteredShareDriver(driver.ShareDriver): except naapi.NaApiError as e: LOG.error(_("Could not get licenses list. %s.") % e) else: - self._licenses = [l.get_child_content('package').lower() - for l in licenses.get_child_by_name('licenses').get_children()] + self._licenses = [ + l.get_child_content('package').lower() + for l in licenses.get_child_by_name('licenses').get_children() + ] log_data = { 'backend': self.backend_name, 'licenses': ', '.join(self._licenses), diff --git a/manila/tests/network/linux/test_ip_lib.py b/manila/tests/network/linux/test_ip_lib.py index 995946439a..03562fda48 100644 --- a/manila/tests/network/linux/test_ip_lib.py +++ b/manila/tests/network/linux/test_ip_lib.py @@ -201,7 +201,7 @@ class TestIpWrapper(test.TestCase): ip_lib.IPWrapper().add_veth('tap0', 'tap1') self.execute.assert_called_once_with('', 'link', ('add', 'tap0', 'type', 'veth', - 'peer', 'name', 'tap1'), + 'peer', 'name', 'tap1'), None, as_root=True) def test_add_veth_with_namespaces(self): diff --git a/manila/tests/scheduler/test_filter_scheduler.py b/manila/tests/scheduler/test_filter_scheduler.py index 71011a8f99..46fd5512a9 100644 --- a/manila/tests/scheduler/test_filter_scheduler.py +++ b/manila/tests/scheduler/test_filter_scheduler.py @@ -148,7 +148,8 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase): retry = dict(num_attempts=2) filter_properties = dict(retry=retry) self.assertRaises(exception.NoValidHost, sched._schedule_share, - self.context, request_spec, filter_properties=filter_properties) + self.context, request_spec, + filter_properties=filter_properties) def test_add_retry_host(self): retry = dict(num_attempts=1, hosts=[]) diff --git a/manila/tests/test_service.py b/manila/tests/test_service.py index b250e58461..7d1e2a93eb 100644 --- a/manila/tests/test_service.py +++ b/manila/tests/test_service.py @@ -162,7 +162,7 @@ class ServiceTestCase(test.TestCase): mock.Mock(return_value=service_ref)) @mock.patch.object(service.db, 'service_update', mock.Mock(return_value=service_ref. - update({'report_count': 1}))) + update({'report_count': 1}))) def test_report_state_newly_connected(self): serv = service.Service(host, binary, topic, CONF.fake_manager) serv.start() diff --git a/tox.ini b/tox.ini index 74692c7b38..69ab625fee 100644 --- a/tox.ini +++ b/tox.ini @@ -50,6 +50,6 @@ commands = bash tools/lintstack.sh # # H904 wrap long lines in parentheses instead of a backslash # reason: removed in hacking (https://review.openstack.org/#/c/101701/) -ignore = E128,H404,H405,H501,H904 +ignore = H404,H405,H501,H904 builtins = _ exclude = .venv,.tox,dist,doc,openstack,*egg