From 341161eead565af4a0eafbd030e59007bbe63011 Mon Sep 17 00:00:00 2001 From: zhongjun Date: Mon, 19 Jun 2017 17:56:01 +0800 Subject: [PATCH] Use parenthesis instead of backslashes in tests folder Use parenthesis instead of backslashes in tests folder TrivialFix Change-Id: I6c2ea07b0bfc5852b28e44989406cc10eb972e53 --- .../api/v1/test_share_types_extra_specs.py | 16 +-- manila/tests/api/v1/test_share_unmanage.py | 8 +- .../tests/api/v2/test_availability_zones.py | 4 +- manila/tests/api/v2/test_quota_sets.py | 4 +- manila/tests/api/v2/test_share_networks.py | 20 ++-- manila/tests/api/v2/test_share_types.py | 4 +- manila/tests/api/v2/test_shares.py | 8 +- manila/tests/compute/test_nova.py | 20 ++-- manila/tests/db/sqlalchemy/test_api.py | 21 ++-- .../network/test_standalone_network_plugin.py | 8 +- manila/tests/scheduler/drivers/test_base.py | 4 +- manila/tests/scheduler/test_host_manager.py | 6 +- .../dell_emc/plugins/isilon/test_isilon.py | 12 +-- .../plugins/isilon/test_isilon_api.py | 8 +- .../glusterfs/test_layout_directory.py | 24 ++--- .../share/drivers/hdfs/test_hdfs_native.py | 6 +- .../share/drivers/huawei/test_huawei_nas.py | 38 +++---- manila/tests/share/drivers/ibm/test_gpfs.py | 24 ++--- .../dataontap/cluster_mode/test_lib_base.py | 16 +-- .../dataontap/protocols/test_nfs_cmode.py | 8 +- manila/tests/share/drivers/test_generic.py | 80 +++++++-------- manila/tests/share/drivers/test_glusterfs.py | 4 +- manila/tests/share/drivers/test_helpers.py | 8 +- .../share/drivers/test_service_instance.py | 76 +++++++------- manila/tests/share/test_api.py | 12 +-- manila/tests/share/test_driver.py | 4 +- manila/tests/share/test_manager.py | 99 ++++++++++--------- manila/tests/test_manager.py | 4 +- manila/tests/volume/test_cinder.py | 8 +- 29 files changed, 278 insertions(+), 276 deletions(-) diff --git a/manila/tests/api/v1/test_share_types_extra_specs.py b/manila/tests/api/v1/test_share_types_extra_specs.py index e84cf5400b..983ed61359 100644 --- a/manila/tests/api/v1/test_share_types_extra_specs.py +++ b/manila/tests/api/v1/test_share_types_extra_specs.py @@ -225,9 +225,9 @@ class ShareTypesExtraSpecsTest(test.TestCase): for k, v in data.items(): self.assertIn(k, res_dict['extra_specs']) self.assertEqual(v, res_dict['extra_specs'][k]) - manila.db.share_type_extra_specs_update_or_create.\ + (manila.db.share_type_extra_specs_update_or_create. assert_called_once_with( - req.environ['manila.context'], 1, body['extra_specs']) + req.environ['manila.context'], 1, body['extra_specs'])) self.mock_policy_check.assert_called_once_with( req_context, self.resource_name, 'create') @@ -277,9 +277,9 @@ class ShareTypesExtraSpecsTest(test.TestCase): self.assertEqual(1, len(fake_notifier.NOTIFICATIONS)) self.assertEqual(mock_return_value['key1'], res_dict['extra_specs']['other_alphanum.-_:']) - manila.db.share_type_extra_specs_update_or_create.\ + (manila.db.share_type_extra_specs_update_or_create. assert_called_once_with( - req.environ['manila.context'], 1, body['extra_specs']) + req.environ['manila.context'], 1, body['extra_specs'])) self.mock_policy_check.assert_called_once_with( req_context, self.resource_name, 'create') @@ -312,8 +312,8 @@ class ShareTypesExtraSpecsTest(test.TestCase): res_dict['extra_specs']['other2_alphanum.-_:']) self.assertEqual(mock_return_value['key3'], res_dict['extra_specs']['other3_alphanum.-_:']) - manila.db.share_type_extra_specs_update_or_create.\ - assert_called_once_with(req_context, 1, body['extra_specs']) + (manila.db.share_type_extra_specs_update_or_create. + assert_called_once_with(req_context, 1, body['extra_specs'])) self.mock_policy_check.assert_called_once_with( req_context, self.resource_name, 'create') @@ -332,8 +332,8 @@ class ShareTypesExtraSpecsTest(test.TestCase): self.assertEqual(1, len(fake_notifier.NOTIFICATIONS)) self.assertTrue(res_dict[DRIVER_HANDLES_SHARE_SERVERS]) - manila.db.share_type_extra_specs_update_or_create.\ - assert_called_once_with(req_context, 1, body) + (manila.db.share_type_extra_specs_update_or_create. + assert_called_once_with(req_context, 1, body)) self.mock_policy_check.assert_called_once_with( req_context, self.resource_name, 'update') diff --git a/manila/tests/api/v1/test_share_unmanage.py b/manila/tests/api/v1/test_share_unmanage.py index 6f9490f5e2..727b3b9db9 100644 --- a/manila/tests/api/v1/test_share_unmanage.py +++ b/manila/tests/api/v1/test_share_unmanage.py @@ -63,9 +63,9 @@ class ShareUnmanageTest(test.TestCase): actual_result = self.controller.unmanage(self.request, share['id']) self.assertEqual(202, actual_result.status_int) - self.controller.share_api.db.share_snapshot_get_all_for_share.\ + (self.controller.share_api.db.share_snapshot_get_all_for_share. assert_called_once_with( - self.request.environ['manila.context'], share['id']) + self.request.environ['manila.context'], share['id'])) self.controller.share_api.get.assert_called_once_with( self.request.environ['manila.context'], share['id']) share_api.API.unmanage.assert_called_once_with( @@ -90,9 +90,9 @@ class ShareUnmanageTest(test.TestCase): self.controller.unmanage, self.request, share['id']) self.assertFalse(self.controller.share_api.unmanage.called) - self.controller.share_api.db.share_snapshot_get_all_for_share.\ + (self.controller.share_api.db.share_snapshot_get_all_for_share. assert_called_once_with( - self.request.environ['manila.context'], share['id']) + self.request.environ['manila.context'], share['id'])) self.controller.share_api.get.assert_called_once_with( self.request.environ['manila.context'], share['id']) self.mock_policy_check.assert_called_once_with( diff --git a/manila/tests/api/v2/test_availability_zones.py b/manila/tests/api/v2/test_availability_zones.py index 9e9cf767ac..bc399bc565 100644 --- a/manila/tests/api/v2/test_availability_zones.py +++ b/manila/tests/api/v2/test_availability_zones.py @@ -72,8 +72,8 @@ class AvailabilityZonesAPITest(test.TestCase): result = az_controller.index(req) - availability_zones.db.availability_zone_get_all.\ - assert_called_once_with(ctxt) + (availability_zones.db.availability_zone_get_all. + assert_called_once_with(ctxt)) mock_policy_check.assert_called_once_with( ctxt, controller.resource_name, 'index') self.assertIsInstance(result, dict) diff --git a/manila/tests/api/v2/test_quota_sets.py b/manila/tests/api/v2/test_quota_sets.py index 9cfa2e9548..f1f0268aa2 100644 --- a/manila/tests/api/v2/test_quota_sets.py +++ b/manila/tests/api/v2/test_quota_sets.py @@ -374,11 +374,11 @@ class QuotaSetsControllerTest(test.TestCase): ) self.assertTrue(hasattr(result, 'status_code')) self.assertEqual(202, result.status_code) - quota_sets.QUOTAS.destroy_all_by_project_and_user. \ + (quota_sets.QUOTAS.destroy_all_by_project_and_user. assert_called_once_with( REQ_WITH_USER.environ['manila.context'], project_id, - REQ_WITH_USER.environ['manila.context'].user_id) + REQ_WITH_USER.environ['manila.context'].user_id)) self.assertFalse(quota_sets.QUOTAS.destroy_all_by_project.called) self.mock_policy_check.assert_called_once_with( REQ_WITH_USER.environ['manila.context'], self.resource_name, diff --git a/manila/tests/api/v2/test_share_networks.py b/manila/tests/api/v2/test_share_networks.py index 5b69494a63..4dcc407dce 100644 --- a/manila/tests/api/v2/test_share_networks.py +++ b/manila/tests/api/v2/test_share_networks.py @@ -217,9 +217,9 @@ class ShareNetworkAPITest(test.TestCase): db_api.share_network_get.assert_called_once_with( self.req.environ['manila.context'], share_nw['id']) - db_api.share_instances_get_all_by_share_network.\ + (db_api.share_instances_get_all_by_share_network. assert_called_once_with(self.req.environ['manila.context'], - share_nw['id']) + share_nw['id'])) self.controller.share_rpcapi.delete_share_server.assert_has_calls([ mock.call(self.req.environ['manila.context'], 'foo'), mock.call(self.req.environ['manila.context'], 'bar')]) @@ -257,9 +257,9 @@ class ShareNetworkAPITest(test.TestCase): db_api.share_network_get.assert_called_once_with( self.req.environ['manila.context'], share_nw['id']) - db_api.share_instances_get_all_by_share_network.\ + (db_api.share_instances_get_all_by_share_network. assert_called_once_with(self.req.environ['manila.context'], - share_nw['id']) + share_nw['id'])) self.controller.share_rpcapi.delete_share_server.assert_has_calls([ mock.call(self.req.environ['manila.context'], 'foo'), @@ -288,9 +288,9 @@ class ShareNetworkAPITest(test.TestCase): db_api.share_network_get.assert_called_once_with( self.req.environ['manila.context'], share_nw['id']) - db_api.share_instances_get_all_by_share_network.\ + (db_api.share_instances_get_all_by_share_network. assert_called_once_with(self.req.environ['manila.context'], - share_nw['id']) + share_nw['id'])) def test_delete_in_use_by_share_group(self): share_nw = fake_share_network.copy() @@ -376,9 +376,9 @@ class ShareNetworkAPITest(test.TestCase): req = fakes.HTTPRequest.blank( '/share_networks?security_service_id=fake-ss-id') result = self.controller.index(req) - db_api.share_network_get_all_by_security_service.\ + (db_api.share_network_get_all_by_security_service. assert_called_once_with(req.environ['manila.context'], - 'fake-ss-id') + 'fake-ss-id')) self.assertEqual(1, len(result[share_networks.RESOURCES_NAME])) self._check_share_network_view_shortened( result[share_networks.RESOURCES_NAME][0], @@ -442,9 +442,9 @@ class ShareNetworkAPITest(test.TestCase): '/share_networks?security_service_id=fake-ss-id&project_id=fake', use_admin_context=True) result = self.controller.index(req) - db_api.share_network_get_all_by_security_service.\ + (db_api.share_network_get_all_by_security_service. assert_called_once_with(req.environ['manila.context'], - 'fake-ss-id') + 'fake-ss-id')) self.assertEqual(1, len(result[share_networks.RESOURCES_NAME])) self._check_share_network_view_shortened( result[share_networks.RESOURCES_NAME][0], diff --git a/manila/tests/api/v2/test_share_types.py b/manila/tests/api/v2/test_share_types.py index 34da5b564f..74933600e3 100644 --- a/manila/tests/api/v2/test_share_types.py +++ b/manila/tests/api/v2/test_share_types.py @@ -98,8 +98,8 @@ def make_create_body(name="test_share_1", extra_specs=None, extra_specs = {} if spec_driver_handles_share_servers is not None: - extra_specs[constants.ExtraSpecs.DRIVER_HANDLES_SHARE_SERVERS] =\ - spec_driver_handles_share_servers + extra_specs[constants.ExtraSpecs.DRIVER_HANDLES_SHARE_SERVERS] = ( + spec_driver_handles_share_servers) body = { "share_type": { diff --git a/manila/tests/api/v2/test_shares.py b/manila/tests/api/v2/test_shares.py index 31ee5a925d..09e221e6af 100644 --- a/manila/tests/api/v2/test_shares.py +++ b/manila/tests/api/v2/test_shares.py @@ -2361,9 +2361,9 @@ class ShareUnmanageTest(test.TestCase): actual_result = self.controller.unmanage(self.request, share['id']) self.assertEqual(202, actual_result.status_int) - self.controller.share_api.db.share_snapshot_get_all_for_share.\ + (self.controller.share_api.db.share_snapshot_get_all_for_share. assert_called_once_with( - self.request.environ['manila.context'], share['id']) + self.request.environ['manila.context'], share['id'])) self.controller.share_api.get.assert_called_once_with( self.request.environ['manila.context'], share['id']) share_api.API.unmanage.assert_called_once_with( @@ -2386,9 +2386,9 @@ class ShareUnmanageTest(test.TestCase): self.controller.unmanage, self.request, share['id']) self.assertFalse(self.controller.share_api.unmanage.called) - self.controller.share_api.db.share_snapshot_get_all_for_share.\ + (self.controller.share_api.db.share_snapshot_get_all_for_share. assert_called_once_with( - self.request.environ['manila.context'], share['id']) + self.request.environ['manila.context'], share['id'])) self.controller.share_api.get.assert_called_once_with( self.request.environ['manila.context'], share['id']) diff --git a/manila/tests/compute/test_nova.py b/manila/tests/compute/test_nova.py index 83eab40e4b..f65436ea90 100644 --- a/manila/tests/compute/test_nova.py +++ b/manila/tests/compute/test_nova.py @@ -337,15 +337,15 @@ class NovaApiTestCase(test.TestCase): self.mock_object(self.novaclient.volumes, 'create_server_volume') self.api.instance_volume_attach(self.ctx, 'instance_id', 'vol_id', 'device') - self.novaclient.volumes.create_server_volume.\ - assert_called_once_with('instance_id', 'vol_id', 'device') + (self.novaclient.volumes.create_server_volume. + assert_called_once_with('instance_id', 'vol_id', 'device')) def test_instance_volume_detach(self): self.mock_object(self.novaclient.volumes, 'delete_server_volume') self.api.instance_volume_detach(self.ctx, 'instance_id', 'att_id') - self.novaclient.volumes.delete_server_volume.\ - assert_called_once_with('instance_id', 'att_id') + (self.novaclient.volumes.delete_server_volume. + assert_called_once_with('instance_id', 'att_id')) def test_instance_volumes_list(self): self.mock_object( @@ -369,8 +369,8 @@ class NovaApiTestCase(test.TestCase): self.mock_object(self.novaclient.volumes, 'update_server_volume') self.api.update_server_volume(self.ctx, 'instance_id', 'att_id', 'new_vol_id') - self.novaclient.volumes.update_server_volume.\ - assert_called_once_with('instance_id', 'att_id', 'new_vol_id') + (self.novaclient.volumes.update_server_volume. + assert_called_once_with('instance_id', 'att_id', 'new_vol_id')) def test_keypair_create(self): self.mock_object(self.novaclient.keypairs, 'create') @@ -380,14 +380,14 @@ class NovaApiTestCase(test.TestCase): def test_keypair_import(self): self.mock_object(self.novaclient.keypairs, 'create') self.api.keypair_import(self.ctx, 'keypair_name', 'fake_pub_key') - self.novaclient.keypairs.create.\ - assert_called_once_with('keypair_name', 'fake_pub_key') + (self.novaclient.keypairs.create. + assert_called_once_with('keypair_name', 'fake_pub_key')) def test_keypair_delete(self): self.mock_object(self.novaclient.keypairs, 'delete') self.api.keypair_delete(self.ctx, 'fake_keypair_id') - self.novaclient.keypairs.delete.\ - assert_called_once_with('fake_keypair_id') + (self.novaclient.keypairs.delete. + assert_called_once_with('fake_keypair_id')) def test_keypair_list(self): self.assertEqual([{'id': 'id1'}, {'id': 'id2'}], diff --git a/manila/tests/db/sqlalchemy/test_api.py b/manila/tests/db/sqlalchemy/test_api.py index 0f33024878..9cff31b820 100644 --- a/manila/tests/db/sqlalchemy/test_api.py +++ b/manila/tests/db/sqlalchemy/test_api.py @@ -1838,11 +1838,12 @@ class ShareNetworkDatabaseAPITestCase(BaseDatabaseAPITestCase): self.share_nw_dict['id'], security_dict1['id']) - result = db_api.model_query( - self.fake_context, - models.ShareNetworkSecurityServiceAssociation).\ - filter_by(security_service_id=security_dict1['id']).\ - filter_by(share_network_id=self.share_nw_dict['id']).first() + result = (db_api.model_query( + self.fake_context, + models.ShareNetworkSecurityServiceAssociation). + filter_by(security_service_id=security_dict1['id']). + filter_by(share_network_id=self.share_nw_dict['id']). + first()) self.assertIsNotNone(result) @@ -1902,11 +1903,11 @@ class ShareNetworkDatabaseAPITestCase(BaseDatabaseAPITestCase): self.share_nw_dict['id'], security_dict1['id']) - result = db_api.model_query( - self.fake_context, - models.ShareNetworkSecurityServiceAssociation).\ - filter_by(security_service_id=security_dict1['id']).\ - filter_by(share_network_id=self.share_nw_dict['id']).first() + result = (db_api.model_query( + self.fake_context, + models.ShareNetworkSecurityServiceAssociation). + filter_by(security_service_id=security_dict1['id']). + filter_by(share_network_id=self.share_nw_dict['id']).first()) self.assertIsNone(result) diff --git a/manila/tests/network/test_standalone_network_plugin.py b/manila/tests/network/test_standalone_network_plugin.py index aef381d959..d79a70ec27 100644 --- a/manila/tests/network/test_standalone_network_plugin.py +++ b/manila/tests/network/test_standalone_network_plugin.py @@ -283,13 +283,13 @@ class StandaloneNetworkPluginTest(test.TestCase): instance.deallocate_network(fake_context, share_server_id) - instance.db.network_allocations_get_for_share_server.\ - assert_called_once_with(fake_context, share_server_id) - instance.db.network_allocation_delete.\ + (instance.db.network_allocations_get_for_share_server. + assert_called_once_with(fake_context, share_server_id)) + (instance.db.network_allocation_delete. assert_has_calls([ mock.call(fake_context, 'fake1'), mock.call(fake_context, 'fake2'), - ]) + ])) def test_allocate_network_zero_addresses_ipv4(self): data = { diff --git a/manila/tests/scheduler/drivers/test_base.py b/manila/tests/scheduler/drivers/test_base.py index c0f48b4809..a1c38e7ed1 100644 --- a/manila/tests/scheduler/drivers/test_base.py +++ b/manila/tests/scheduler/drivers/test_base.py @@ -50,8 +50,8 @@ class SchedulerTestCase(test.TestCase): 'update_service_capabilities', mock.Mock()): self.driver.update_service_capabilities( service_name, host, capabilities) - self.driver.host_manager.update_service_capabilities.\ - assert_called_once_with(service_name, host, capabilities) + (self.driver.host_manager.update_service_capabilities. + assert_called_once_with(service_name, host, capabilities)) def test_hosts_up(self): service1 = {'host': 'host1'} diff --git a/manila/tests/scheduler/test_host_manager.py b/manila/tests/scheduler/test_host_manager.py index 576d0e8c13..7cfca6883a 100644 --- a/manila/tests/scheduler/test_host_manager.py +++ b/manila/tests/scheduler/test_host_manager.py @@ -836,9 +836,9 @@ class HostStateTestCase(test.TestCase): context=fake_context) result = fake_host.__repr__() - expected = "host: 'host1', free_capacity_gb: None, " \ - "pools: {'Backend1': host: 'host1#Backend1', " \ - "free_capacity_gb: 15000, pools: None}" + expected = ("host: 'host1', free_capacity_gb: None, " + "pools: {'Backend1': host: 'host1#Backend1', " + "free_capacity_gb: 15000, pools: None}") self.assertEqual(expected, result) diff --git a/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon.py b/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon.py index d6acd52453..fffa167e60 100644 --- a/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon.py +++ b/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon.py @@ -940,8 +940,8 @@ class IsilonTest(test.TestCase): } access_rules = [access] add_rules = [access] - self._mock_isilon_api.request.return_value.raise_for_status.\ - side_effect = HTTPError + (self._mock_isilon_api.request.return_value.raise_for_status. + side_effect) = HTTPError rule_map = self.storage_connection.update_access( self.mock_context, share, access_rules, add_rules, []) @@ -966,8 +966,8 @@ class IsilonTest(test.TestCase): } add_rules = [access] access_rules = [access] - self._mock_isilon_api.request.return_value.raise_for_status.\ - side_effect = HTTPError + (self._mock_isilon_api.request.return_value.raise_for_status. + side_effect) = HTTPError rule_map = self.storage_connection.update_access( self.mock_context, share, access_rules, add_rules, []) @@ -993,8 +993,8 @@ class IsilonTest(test.TestCase): add_rules = [access] access_rules = [access] message = _('Only "RW" and "RO" access levels are supported.') - self._mock_isilon_api.smb_permissions_add.side_effect = \ - exception.ShareBackendException(message=message) + self._mock_isilon_api.smb_permissions_add.side_effect = ( + exception.ShareBackendException(message=message)) rule_map = self.storage_connection.update_access( self.mock_context, share, access_rules, add_rules, []) diff --git a/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon_api.py b/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon_api.py index 968943c6d7..0ca874285b 100644 --- a/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon_api.py +++ b/manila/tests/share/drivers/dell_emc/plugins/isilon/test_isilon_api.py @@ -632,8 +632,8 @@ class IsilonApiTest(test.TestCase): } m.get(papi_share_url, status_code=200, json=share_data) - auth_url = '{0}/platform/1/auth/mapping/users/lookup?user={1}' \ - ''.format(self._mock_url, user) + auth_url = ('{0}/platform/1/auth/mapping/users/lookup?user={1}' + ''.format(self._mock_url, user)) example_sid = 'SID:S-1-5-21' sid_json = { 'id': example_sid, @@ -675,8 +675,8 @@ class IsilonApiTest(test.TestCase): } m.get(papi_share_url, status_code=200, json=share_data) - auth_url = '{0}/platform/1/auth/mapping/users/lookup?user={1}' \ - ''.format(self._mock_url, user) + auth_url = ('{0}/platform/1/auth/mapping/users/lookup?user={1}' + ''.format(self._mock_url, user)) example_sid = 'SID:S-1-5-21' sid_json = { 'id': example_sid, diff --git a/manila/tests/share/drivers/glusterfs/test_layout_directory.py b/manila/tests/share/drivers/glusterfs/test_layout_directory.py index 1b555d4842..5fa6cb610b 100644 --- a/manila/tests/share/drivers/glusterfs/test_layout_directory.py +++ b/manila/tests/share/drivers/glusterfs/test_layout_directory.py @@ -182,8 +182,8 @@ class GlusterfsDirectoryMappedLayoutTestCase(test.TestCase): self.assertTrue(common._mount_gluster_vol.called) def test_ensure_gluster_vol_mounted_error(self): - common._mount_gluster_vol =\ - mock.Mock(side_effect=exception.GlusterfsException) + common._mount_gluster_vol = ( + mock.Mock(side_effect=exception.GlusterfsException)) self.assertRaises(exception.GlusterfsException, self._layout._ensure_gluster_vol_mounted) @@ -205,12 +205,12 @@ class GlusterfsDirectoryMappedLayoutTestCase(test.TestCase): def test_update_share_stats(self): test_statvfs = mock.Mock(f_frsize=4096, f_blocks=524288, f_bavail=524288) - self._layout._get_mount_point_for_gluster_vol = \ - mock.Mock(return_value='/mnt/nfs/testvol') + self._layout._get_mount_point_for_gluster_vol = ( + mock.Mock(return_value='/mnt/nfs/testvol')) some_no = 42 not_some_no = some_no + 1 - os_stat = lambda path: mock.Mock(st_dev=some_no) if path == '/mnt/nfs' \ - else mock.Mock(st_dev=not_some_no) + os_stat = (lambda path: mock.Mock(st_dev=some_no) if path == '/mnt/nfs' + else mock.Mock(st_dev=not_some_no)) with mock.patch.object(os, 'statvfs', return_value=test_statvfs): with mock.patch.object(os, 'stat', os_stat): @@ -223,8 +223,8 @@ class GlusterfsDirectoryMappedLayoutTestCase(test.TestCase): self.assertEqual(test_data, ret) def test_update_share_stats_gluster_mnt_unavailable(self): - self._layout._get_mount_point_for_gluster_vol = \ - mock.Mock(return_value='/mnt/nfs/testvol') + self._layout._get_mount_point_for_gluster_vol = ( + mock.Mock(return_value='/mnt/nfs/testvol')) some_no = 42 with mock.patch.object(os, 'stat', return_value=mock.Mock(st_dev=some_no)): @@ -342,8 +342,8 @@ class GlusterfsDirectoryMappedLayoutTestCase(test.TestCase): self.assertIsNone(ret) def test_delete_share(self): - self._layout._get_local_share_path =\ - mock.Mock(return_value='/mnt/nfs/testvol/fakename') + self._layout._get_local_share_path = ( + mock.Mock(return_value='/mnt/nfs/testvol/fakename')) self._layout.delete_share(self._context, self.share) @@ -351,8 +351,8 @@ class GlusterfsDirectoryMappedLayoutTestCase(test.TestCase): fake_utils.fake_execute_get_log()) def test_cannot_delete_share(self): - self._layout._get_local_share_path =\ - mock.Mock(return_value='/mnt/nfs/testvol/fakename') + self._layout._get_local_share_path = ( + mock.Mock(return_value='/mnt/nfs/testvol/fakename')) def exec_runner(*ignore_args, **ignore_kw): raise exception.ProcessExecutionError diff --git a/manila/tests/share/drivers/hdfs/test_hdfs_native.py b/manila/tests/share/drivers/hdfs/test_hdfs_native.py index 15915f1410..f7f71465bf 100644 --- a/manila/tests/share/drivers/hdfs/test_hdfs_native.py +++ b/manila/tests/share/drivers/hdfs/test_hdfs_native.py @@ -377,9 +377,9 @@ class HDFSNativeShareDriverTestCase(test.TestCase): 'fake_hdfs_bin', 'fsck', '/') def test__get_available_capacity(self): - fake_out = 'Configured Capacity: 2.4\n' + \ - 'Total Capacity: 2\n' + \ - 'DFS free: 1' + fake_out = ('Configured Capacity: 2.4\n' + + 'Total Capacity: 2\n' + + 'DFS free: 1') self._driver._hdfs_execute = mock.Mock(return_value=(fake_out, '')) total, free = self._driver._get_available_capacity() self._driver._hdfs_execute.assert_called_once_with( diff --git a/manila/tests/share/drivers/huawei/test_huawei_nas.py b/manila/tests/share/drivers/huawei/test_huawei_nas.py index 61529c78db..f38a6a2b82 100644 --- a/manila/tests/share/drivers/huawei/test_huawei_nas.py +++ b/manila/tests/share/drivers/huawei/test_huawei_nas.py @@ -498,42 +498,42 @@ class FakeHuaweiNasHelper(helper.RestHelper): self.delete_flag = True if url == "/NFS_SHARE_AUTH_CLIENT": - data, self.allow_ro_flag, self.allow_rw_flag = \ - allow_access('NFS', method, data) + data, self.allow_ro_flag, self.allow_rw_flag = ( + allow_access('NFS', method, data)) self.allow_flag = True if url == "/CIFS_SHARE_AUTH_CLIENT": - data, self.allow_ro_flag, self.allow_rw_flag = \ - allow_access('CIFS', method, data) + data, self.allow_ro_flag, self.allow_rw_flag = ( + allow_access('CIFS', method, data)) self.allow_flag = True - if url == "/FSSNAPSHOT?TYPE=48&PARENTID=4"\ - "&&sortby=TIMESTAMP,d&range=[0-2000]": + if url == ("/FSSNAPSHOT?TYPE=48&PARENTID=4" + "&&sortby=TIMESTAMP,d&range=[0-2000]"): data = """{"error":{"code":0}, "data":[{"ID":"3", "NAME":"share_snapshot_fake_snapshot_uuid"}]}""" self.delete_flag = True - if url == "/NFS_SHARE_AUTH_CLIENT?"\ - "filter=PARENTID::1&range=[0-100]": + if url == ("/NFS_SHARE_AUTH_CLIENT?" + "filter=PARENTID::1&range=[0-100]"): data = """{"error":{"code":0}, "data":[{"ID":"0", "NAME":"100.112.0.1_fail"}]}""" - if url == "/CIFS_SHARE_AUTH_CLIENT?"\ - "filter=PARENTID::2&range=[0-100]": + if url == ("/CIFS_SHARE_AUTH_CLIENT?" + "filter=PARENTID::2&range=[0-100]"): data = """{"error":{"code":0}, "data":[{"ID":"0", "NAME":"user_name_fail"}]}""" - if url == "/NFS_SHARE_AUTH_CLIENT?"\ - "filter=PARENTID::1&range=[100-200]": + if url == ("/NFS_SHARE_AUTH_CLIENT?" + "filter=PARENTID::1&range=[100-200]"): data = """{"error":{"code":0}, "data":[{"ID":"5", "NAME":"100.112.0.2"}]}""" - if url == "/CIFS_SHARE_AUTH_CLIENT?"\ - "filter=PARENTID::2&range=[100-200]": + if url == ("/CIFS_SHARE_AUTH_CLIENT?" + "filter=PARENTID::2&range=[100-200]"): data = """{"error":{"code":0}, "data":[{"ID":"6", "NAME":"user_exist"}]}""" @@ -560,9 +560,9 @@ class FakeHuaweiNasHelper(helper.RestHelper): data = """{"error":{"code":0},"data":{ "COUNT":"196"}}""" - if url == "/NFS_SHARE_AUTH_CLIENT/count?filter=PARENTID::1"\ - or url == "/CIFS_SHARE_AUTH_CLIENT/count?filter="\ - "PARENTID::2": + if (url == "/NFS_SHARE_AUTH_CLIENT/count?filter=PARENTID::1" + or url == ("/CIFS_SHARE_AUTH_CLIENT/count?filter=" + "PARENTID::2")): data = """{"error":{"code":0},"data":{ "COUNT":"196"}}""" @@ -3318,8 +3318,8 @@ class HuaweiShareDriverTestCase(test.TestCase): def test_setup_server_invalid_ipv4(self): netwot_info_invali_ipv4 = self.fake_network_info - netwot_info_invali_ipv4['network_allocations'][0]['ip_address'] =\ - "::1/128" + netwot_info_invali_ipv4['network_allocations'][0]['ip_address'] = ( + "::1/128") self.assertRaises(exception.InvalidInput, self.driver._setup_server, netwot_info_invali_ipv4) diff --git a/manila/tests/share/drivers/ibm/test_gpfs.py b/manila/tests/share/drivers/ibm/test_gpfs.py index 3048a526d0..718697562f 100644 --- a/manila/tests/share/drivers/ibm/test_gpfs.py +++ b/manila/tests/share/drivers/ibm/test_gpfs.py @@ -92,12 +92,12 @@ mmcesnfslsexport:nfsexports:HEADER:version:reserved:reserved:Path:Delegations:Cl self.remote_ip2 = "2.2.2.2" gpfs_nfs_server_list = [self.remote_ip, self.local_ip, self.remote_ip2, "fake_location"] - self._knfs_helper.configuration.gpfs_nfs_server_list = \ - gpfs_nfs_server_list - self._ces_helper.configuration.gpfs_nfs_server_list = \ - gpfs_nfs_server_list - self._ces_helper.configuration.ganesha_config_path = \ - "fake_ganesha_config_path" + self._knfs_helper.configuration.gpfs_nfs_server_list = ( + gpfs_nfs_server_list) + self._ces_helper.configuration.gpfs_nfs_server_list = ( + gpfs_nfs_server_list) + self._ces_helper.configuration.ganesha_config_path = ( + "fake_ganesha_config_path") self.sshlogin = "fake_login" self.sshkey = "fake_sshkey" self.gservice = "fake_ganesha_service" @@ -233,22 +233,22 @@ mmcesnfslsexport:nfsexports:HEADER:version:reserved:reserved:Path:Delegations:Cl def test__local_path(self): sharename = 'fakesharename' - self._driver.configuration.gpfs_mount_point_base =\ - self.fakefspath + self._driver.configuration.gpfs_mount_point_base = ( + self.fakefspath) local_path = self._driver._local_path(sharename) self.assertEqual(self.fakefspath + '/' + sharename, local_path) def test__get_share_path(self): - self._driver.configuration.gpfs_mount_point_base =\ - self.fakefspath + self._driver.configuration.gpfs_mount_point_base = ( + self.fakefspath) share_path = self._driver._get_share_path(self.share) self.assertEqual(self.fakefspath + '/' + self.share['name'], share_path) def test__get_snapshot_path(self): - self._driver.configuration.gpfs_mount_point_base =\ - self.fakefspath + self._driver.configuration.gpfs_mount_point_base = ( + self.fakefspath) snapshot_path = self._driver._get_snapshot_path(self.snapshot) self.assertEqual(self.fakefspath + '/' + self.snapshot['share_name'] + '/.snapshots/' + self.snapshot['name'], diff --git a/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py b/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py index 7e82f2d5c4..510ad01691 100644 --- a/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py +++ b/manila/tests/share/drivers/netapp/dataontap/cluster_mode/test_lib_base.py @@ -115,8 +115,8 @@ class NetAppFileStorageLibraryTestCase(test.TestCase): self.library.do_setup(self.context) mock_get_api_client.assert_called_once_with() - self.library._client.check_for_cluster_credentials.\ - assert_called_once_with() + (self.library._client.check_for_cluster_credentials. + assert_called_once_with()) self.assertEqual('fake_perf_library', self.library._perf_library) def test_check_for_setup_error(self): @@ -295,8 +295,8 @@ class NetAppFileStorageLibraryTestCase(test.TestCase): result = self.library._get_aggregate_space() - self.library._client.get_cluster_aggregate_capacities.\ - assert_called_once_with(fake.AGGREGATES) + (self.library._client.get_cluster_aggregate_capacities. + assert_called_once_with(fake.AGGREGATES)) self.assertDictEqual(fake.AGGREGATE_CAPACITIES, result) def test_get_aggregate_space_no_cluster_creds(self): @@ -311,8 +311,8 @@ class NetAppFileStorageLibraryTestCase(test.TestCase): result = self.library._get_aggregate_space() - self.library._client.get_vserver_aggregate_capacities.\ - assert_called_once_with(fake.AGGREGATES) + (self.library._client.get_vserver_aggregate_capacities. + assert_called_once_with(fake.AGGREGATES)) self.assertDictEqual(fake.AGGREGATE_CAPACITIES, result) def test_get_aggregate_node_cluster_creds(self): @@ -324,8 +324,8 @@ class NetAppFileStorageLibraryTestCase(test.TestCase): result = self.library._get_aggregate_node(fake.AGGREGATE) - self.library._client.get_node_for_aggregate.\ - assert_called_once_with(fake.AGGREGATE) + (self.library._client.get_node_for_aggregate. + assert_called_once_with(fake.AGGREGATE)) self.assertEqual(fake.CLUSTER_NODE, result) def test_get_aggregate_node_no_cluster_creds(self): diff --git a/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py b/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py index 0c12b5bd5c..ba7e3c5071 100644 --- a/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py +++ b/manila/tests/share/drivers/netapp/dataontap/protocols/test_nfs_cmode.py @@ -64,8 +64,8 @@ class NetAppClusteredNFSHelperTestCase(test.TestCase): self.helper.delete_share(fake.NFS_SHARE, fake.SHARE_NAME) - self.mock_client.clear_nfs_export_policy_for_volume.\ - assert_called_once_with(fake.SHARE_NAME) + (self.mock_client.clear_nfs_export_policy_for_volume. + assert_called_once_with(fake.SHARE_NAME)) self.mock_client.soft_delete_nfs_export_policy.assert_called_once_with( fake.EXPORT_POLICY_NAME) @@ -230,8 +230,8 @@ class NetAppClusteredNFSHelperTestCase(test.TestCase): self.mock_client.create_nfs_export_policy.assert_called_once_with( fake.EXPORT_POLICY_NAME) - self.mock_client.set_nfs_export_policy_for_volume.\ - assert_called_once_with(fake.SHARE_NAME, fake.EXPORT_POLICY_NAME) + (self.mock_client.set_nfs_export_policy_for_volume. + assert_called_once_with(fake.SHARE_NAME, fake.EXPORT_POLICY_NAME)) self.assertFalse(self.mock_client.rename_nfs_export_policy.called) def test_ensure_export_policy_rename(self): diff --git a/manila/tests/share/drivers/test_generic.py b/manila/tests/share/drivers/test_generic.py index 6a78b84687..942af3b4c2 100644 --- a/manila/tests/share/drivers/test_generic.py +++ b/manila/tests/share/drivers/test_generic.py @@ -179,8 +179,8 @@ class GenericShareDriverTestCase(test.TestCase): compute.API.assert_called_once_with() self._driver._setup_helpers.assert_called_once_with() if not dhss: - self._driver.service_instance_manager.get_common_server.\ - assert_called_once_with() + (self._driver.service_instance_manager.get_common_server. + assert_called_once_with()) self._driver._is_share_server_active.assert_called_once_with( self._context, fake_server) else: @@ -213,8 +213,8 @@ class GenericShareDriverTestCase(test.TestCase): volume.API.assert_called_once_with() compute.API.assert_called_once_with() self._driver._setup_helpers.assert_called_once_with() - self._driver.service_instance_manager.get_common_server.\ - assert_has_calls([mock.call()] * 3) + (self._driver.service_instance_manager.get_common_server. + assert_has_calls([mock.call()] * 3)) self._driver._is_share_server_active.assert_has_calls( [mock.call(self._context, fake_server)] * 2) mock_sleep.assert_has_calls([mock.call(5)] * 2) @@ -543,9 +543,9 @@ class GenericShareDriverTestCase(test.TestCase): result = self._driver._attach_volume(self._context, self.share, 'fake_inst_id', available_volume) - self._driver.compute_api.instance_volume_attach.\ + (self._driver.compute_api.instance_volume_attach. assert_called_once_with(self._context, 'fake_inst_id', - available_volume['id']) + available_volume['id'])) self._driver.volume_api.get.assert_called_once_with( self._context, attached_volume['id']) self.assertEqual(attached_volume, result) @@ -732,11 +732,11 @@ class GenericShareDriverTestCase(test.TestCase): self._driver._detach_volume(self._context, self.share, self.server['backend_details']) - self._driver.compute_api.instance_volume_detach.\ + (self._driver.compute_api.instance_volume_detach. assert_called_once_with( self._context, self.server['backend_details']['instance_id'], - available_volume['id']) + available_volume['id'])) self._driver.volume_api.get.assert_called_once_with( self._context, available_volume['id']) @@ -944,13 +944,13 @@ class GenericShareDriverTestCase(test.TestCase): self._driver.delete_share(self._context, self.share) - self._driver.service_instance_manager.get_common_server.\ - assert_called_once_with() + (self._driver.service_instance_manager.get_common_server. + assert_called_once_with()) self._driver._deallocate_container.assert_called_once_with( self._driver.admin_context, self.share) - self._driver.service_instance_manager.ensure_service_instance.\ + (self._driver.service_instance_manager.ensure_service_instance. assert_called_once_with( - self._context, self.server['backend_details']) + self._context, self.server['backend_details'])) def test_delete_share(self): self.mock_object(self._driver, '_unmount_device') @@ -969,9 +969,9 @@ class GenericShareDriverTestCase(test.TestCase): self.server['backend_details']) self._driver._deallocate_container.assert_called_once_with( self._driver.admin_context, self.share) - self._driver.service_instance_manager.ensure_service_instance.\ + (self._driver.service_instance_manager.ensure_service_instance. assert_called_once_with( - self._context, self.server['backend_details']) + self._context, self.server['backend_details'])) def test_detach_volume_with_volume_not_found(self): fake_vol = fake_volume.FakeVolume() @@ -1048,9 +1048,9 @@ class GenericShareDriverTestCase(test.TestCase): self.assertFalse(self._driver._detach_volume.called) self._driver._deallocate_container.assert_called_once_with( self._driver.admin_context, self.share) - self._driver.service_instance_manager.ensure_service_instance.\ + (self._driver.service_instance_manager.ensure_service_instance. assert_called_once_with( - self._context, self.server['backend_details']) + self._context, self.server['backend_details'])) def test_delete_share_invalid_helper(self): self._driver._helpers = {'CIFS': self._helper_cifs} @@ -1156,10 +1156,10 @@ class GenericShareDriverTestCase(test.TestCase): share_server=self.server) # asserts - self._driver._helpers[self.share['share_proto']].\ + (self._driver._helpers[self.share['share_proto']]. update_access.assert_called_once_with( self.server['backend_details'], self.share['name'], - access_rules, add_rules=add_rules, delete_rules=delete_rules) + access_rules, add_rules=add_rules, delete_rules=delete_rules)) @ddt.data(fake_share.fake_share(), fake_share.fake_share(share_proto='NFSBOGUS'), @@ -1201,9 +1201,9 @@ class GenericShareDriverTestCase(test.TestCase): 'router_id': 'fake_router_id', } self._driver.teardown_server(server_details) - self._driver.service_instance_manager.delete_service_instance.\ + (self._driver.service_instance_manager.delete_service_instance. assert_called_once_with( - self._driver.admin_context, server_details) + self._driver.admin_context, server_details)) def test_ssh_exec_connection_not_exist(self): ssh_conn_timeout = 30 @@ -1372,9 +1372,9 @@ class GenericShareDriverTestCase(test.TestCase): self._driver.service_instance_manager.get_common_server.call_count) self._driver._is_device_mounted.assert_called_once_with( fake_path, None) - self._driver._helpers[share['share_proto']].\ + (self._driver._helpers[share['share_proto']]. get_share_path_by_export_location.assert_called_once_with( - None, share['export_locations'][0]['path']) + None, share['export_locations'][0]['path'])) def test_manage_share_not_attached_to_cinder_volume_invalid_size(self): share = get_fake_manage_share() @@ -1397,9 +1397,9 @@ class GenericShareDriverTestCase(test.TestCase): self._driver._get_mounted_share_size.assert_called_once_with( fake_path, server_details) - self._driver._helpers[share['share_proto']].\ + (self._driver._helpers[share['share_proto']]. get_share_path_by_export_location.assert_called_once_with( - server_details, share['export_locations'][0]['path']) + server_details, share['export_locations'][0]['path'])) def test_manage_share_not_attached_to_cinder_volume(self): share = get_fake_manage_share() @@ -1424,12 +1424,12 @@ class GenericShareDriverTestCase(test.TestCase): self.assertEqual( {'size': share_size, 'export_locations': fake_exports}, result) - self._driver._helpers[share['share_proto']].get_exports_for_share.\ + (self._driver._helpers[share['share_proto']].get_exports_for_share. assert_called_once_with( - server_details, share['export_locations'][0]['path']) - self._driver._helpers[share['share_proto']].\ + server_details, share['export_locations'][0]['path'])) + (self._driver._helpers[share['share_proto']]. get_share_path_by_export_location.assert_called_once_with( - server_details, share['export_locations'][0]['path']) + server_details, share['export_locations'][0]['path'])) self._driver._get_mounted_share_size.assert_called_once_with( fake_path, server_details) self.assertFalse(self._driver._get_volume.called) @@ -1493,9 +1493,9 @@ class GenericShareDriverTestCase(test.TestCase): self.assertEqual( {'size': fake_size, 'export_locations': fake_exports}, result) - self._driver._helpers[share['share_proto']].get_exports_for_share.\ + (self._driver._helpers[share['share_proto']].get_exports_for_share. assert_called_once_with( - server_details, share['export_locations'][0]['path']) + server_details, share['export_locations'][0]['path'])) expected_volume_update = { 'name': self._driver._get_volume_name(share['id']) } @@ -1602,10 +1602,10 @@ class GenericShareDriverTestCase(test.TestCase): self.assertFalse(self._driver._extend_volume.called) self.assertFalse(self._driver._attach_volume.called) - self._helper_nfs.disable_access_for_maintenance.\ - assert_called_once_with(srv_details, 'test_share') - self._helper_nfs.restore_access_after_maintenance.\ - assert_called_once_with(srv_details, 'test_share') + (self._helper_nfs.disable_access_for_maintenance. + assert_called_once_with(srv_details, 'test_share')) + (self._helper_nfs.restore_access_after_maintenance. + assert_called_once_with(srv_details, 'test_share')) self.assertTrue(self._driver._resize_filesystem.called) def test_extend_volume(self): @@ -1828,11 +1828,11 @@ class GenericDriverEnsureServerTestCase(test.TestCase): actual = fake(self.dhss_false, self._context) self.assertEqual(self.server, actual) - self.dhss_false.service_instance_manager.\ - get_common_server.assert_called_once_with() - self.dhss_false.service_instance_manager.ensure_service_instance.\ + (self.dhss_false.service_instance_manager. + get_common_server.assert_called_once_with()) + (self.dhss_false.service_instance_manager.ensure_service_instance. assert_called_once_with( - self._context, self.server['backend_details']) + self._context, self.server['backend_details'])) @ddt.data({'id': 'without_details'}, {'id': 'with_details', 'backend_details': {'foo': 'bar'}}) @@ -1849,9 +1849,9 @@ class GenericDriverEnsureServerTestCase(test.TestCase): actual = fake(self.dhss_true, self._context, share_server=self.server) self.assertEqual(self.server, actual) - self.dhss_true.service_instance_manager.ensure_service_instance.\ + (self.dhss_true.service_instance_manager.ensure_service_instance. assert_called_once_with( - self._context, self.server['backend_details']) + self._context, self.server['backend_details'])) def test_share_servers_are_handled_invalid_server_provided(self): server = {'id': 'without_details'} diff --git a/manila/tests/share/drivers/test_glusterfs.py b/manila/tests/share/drivers/test_glusterfs.py index 98d814f110..44438747f5 100644 --- a/manila/tests/share/drivers/test_glusterfs.py +++ b/manila/tests/share/drivers/test_glusterfs.py @@ -450,8 +450,8 @@ class GaneshaNFSHelperTestCase(test.TestCase): ret = self._helper._default_config_hook() - glusterfs.ganesha.GaneshaNASHelper._default_config_hook.\ - assert_called_once_with() + (glusterfs.ganesha.GaneshaNASHelper._default_config_hook. + assert_called_once_with()) glusterfs.ganesha_utils.path_from.assert_called_once_with( glusterfs.__file__, 'conf') self._helper._load_conf_dir.assert_called_once_with( diff --git a/manila/tests/share/drivers/test_helpers.py b/manila/tests/share/drivers/test_helpers.py index 74f1dae314..c3cd1a242b 100644 --- a/manila/tests/share/drivers/test_helpers.py +++ b/manila/tests/share/drivers/test_helpers.py @@ -551,8 +551,8 @@ class CIFSHelperIPAccessTestCase(test.TestCase): "metadata": {"export_location_metadata_example": "example"} }] self.assertEqual(expected_export_location, result) - self._helper._get_share_group_name_from_export_location.\ - assert_called_once_with(export_location) + (self._helper._get_share_group_name_from_export_location. + assert_called_once_with(export_location)) @ddt.data( {'public_address_with_suffix': 'foo'}, @@ -583,8 +583,8 @@ class CIFSHelperIPAccessTestCase(test.TestCase): self.assertEqual('/bar/quuz', result) self._helper._ssh_exec.assert_called_once_with( fake_server, ['sudo', 'net', 'conf', 'getparm', 'foo', 'path']) - self._helper._get_share_group_name_from_export_location.\ - assert_called_once_with(export_location) + (self._helper._get_share_group_name_from_export_location. + assert_called_once_with(export_location)) def test_disable_access_for_maintenance(self): allowed_hosts = ['test', 'test2'] diff --git a/manila/tests/share/drivers/test_service_instance.py b/manila/tests/share/drivers/test_service_instance.py index 76e1dd940e..1a06cfa19a 100644 --- a/manila/tests/share/drivers/test_service_instance.py +++ b/manila/tests/share/drivers/test_service_instance.py @@ -964,9 +964,9 @@ class ServiceInstanceManagerTestCase(test.TestCase): availability_zone=service_instance.CONF.storage_availability_zone) self._manager.compute_api.server_get.assert_called_once_with( self._manager.admin_context, server_create['id']) - self._manager.compute_api.add_security_group_to_server.\ + (self._manager.compute_api.add_security_group_to_server. assert_called_once_with( - self._manager.admin_context, server_get['id'], sg['id']) + self._manager.admin_context, server_get['id'], sg['id'])) self._manager.network_helper.get_network_name.assert_has_calls([]) def test___create_service_instance_neutron_no_admin_ip(self): @@ -1039,9 +1039,9 @@ class ServiceInstanceManagerTestCase(test.TestCase): availability_zone=service_instance.CONF.storage_availability_zone) self._manager.compute_api.server_get.assert_called_once_with( self._manager.admin_context, server_create['id']) - self._manager.compute_api.add_security_group_to_server.\ + (self._manager.compute_api.add_security_group_to_server. assert_called_once_with( - self._manager.admin_context, server_get['id'], sg['id']) + self._manager.admin_context, server_get['id'], sg['id'])) self._manager.network_helper.get_network_name.assert_has_calls([]) @ddt.data( @@ -1320,14 +1320,14 @@ class NeutronNetworkHelperTestCase(test.TestCase): 'connect_share_server_to_tenant_network', 'get_config_option'] for attr in attrs: self.assertTrue(hasattr(instance, attr), "No attr '%s'" % attr) - service_instance.NeutronNetworkHelper._get_service_network_id.\ - assert_called_once_with() + (service_instance.NeutronNetworkHelper._get_service_network_id. + assert_called_once_with()) self.assertEqual('DEFAULT', instance.neutron_api.config_group_name) def test_init_neutron_network_plugin_with_driver_config_group(self): self.fake_manager.driver_config = mock.Mock() - self.fake_manager.driver_config.config_group =\ - 'fake_config_group' + self.fake_manager.driver_config.config_group = ( + 'fake_config_group') self.fake_manager.driver_config.network_config_group = None instance = self._init_neutron_network_plugin() self.assertEqual('fake_config_group', @@ -1335,10 +1335,10 @@ class NeutronNetworkHelperTestCase(test.TestCase): def test_init_neutron_network_plugin_with_network_config_group(self): self.fake_manager.driver_config = mock.Mock() - self.fake_manager.driver_config.config_group =\ - "fake_config_group" - self.fake_manager.driver_config.network_config_group =\ - "fake_network_config_group" + self.fake_manager.driver_config.config_group = ( + "fake_config_group") + self.fake_manager.driver_config.network_config_group = ( + "fake_network_config_group") instance = self._init_neutron_network_plugin() self.assertEqual('fake_network_config_group', instance.neutron_api.config_group_name) @@ -1416,8 +1416,8 @@ class NeutronNetworkHelperTestCase(test.TestCase): self.assertRaises(exception.ManilaException, lambda: helper.service_network_id) - service_instance.neutron.API.get_all_admin_project_networks.\ - assert_has_calls([mock.call()]) + (service_instance.neutron.API.get_all_admin_project_networks. + assert_has_calls([mock.call()])) @ddt.data(dict(), dict(subnet_id='foo'), dict(router_id='bar')) def test_teardown_network_no_service_data(self, server_details): @@ -1558,10 +1558,10 @@ class NeutronNetworkHelperTestCase(test.TestCase): instance.teardown_network(server_details) - service_instance.neutron.API.router_remove_interface.\ - assert_called_once_with('bar', 'foo') - service_instance.neutron.API.update_subnet.\ - assert_called_once_with('foo', '') + (service_instance.neutron.API.router_remove_interface. + assert_called_once_with('bar', 'foo')) + (service_instance.neutron.API.update_subnet. + assert_called_once_with('foo', '')) service_instance.neutron.API.list_ports.assert_called_once_with( fields=['fixed_ips', 'device_id', 'device_owner']) @@ -1584,10 +1584,10 @@ class NeutronNetworkHelperTestCase(test.TestCase): instance.teardown_network(server_details) - service_instance.neutron.API.router_remove_interface.\ - assert_called_once_with('bar', 'foo') - service_instance.neutron.API.update_subnet.\ - assert_called_once_with('foo', '') + (service_instance.neutron.API.router_remove_interface. + assert_called_once_with('bar', 'foo')) + (service_instance.neutron.API.update_subnet. + assert_called_once_with('foo', '')) service_instance.neutron.API.list_ports.assert_called_once_with( fields=['fixed_ips', 'device_id', 'device_owner']) @@ -1612,8 +1612,8 @@ class NeutronNetworkHelperTestCase(test.TestCase): exception.NetworkException, instance.teardown_network, server_details) - service_instance.neutron.API.router_remove_interface.\ - assert_called_once_with('bar', 'foo') + (service_instance.neutron.API.router_remove_interface. + assert_called_once_with('bar', 'foo')) self.assertFalse(service_instance.neutron.API.update_subnet.called) service_instance.neutron.API.list_ports.assert_called_once_with( fields=['fixed_ips', 'device_id', 'device_owner']) @@ -1671,8 +1671,8 @@ class NeutronNetworkHelperTestCase(test.TestCase): result = instance.setup_network(network_info) self.assertEqual(expected, result) - instance.setup_connectivity_with_service_instances.\ - assert_called_once_with() + (instance.setup_connectivity_with_service_instances. + assert_called_once_with()) instance._get_service_subnet.assert_called_once_with(mock.ANY) instance._get_cidr_for_subnet.assert_called_once_with() self.assertTrue(service_instance.neutron.API.subnet_create.called) @@ -1722,8 +1722,8 @@ class NeutronNetworkHelperTestCase(test.TestCase): result = instance.setup_network(network_info) self.assertEqual(expected, result) - instance.setup_connectivity_with_service_instances.\ - assert_called_once_with() + (instance.setup_connectivity_with_service_instances. + assert_called_once_with()) self.assertTrue(service_instance.neutron.API.create_port.called) @ddt.data(None, exception.NetworkException(code=400)) @@ -1779,16 +1779,16 @@ class NeutronNetworkHelperTestCase(test.TestCase): result = instance.setup_network(network_info) self.assertEqual(expected, result) - instance.setup_connectivity_with_service_instances.\ - assert_called_once_with() + (instance.setup_connectivity_with_service_instances. + assert_called_once_with()) instance._get_service_subnet.assert_called_once_with(mock.ANY) instance._get_cidr_for_subnet.assert_called_once_with() self.assertTrue(service_instance.neutron.API.subnet_create.called) self.assertTrue(service_instance.neutron.API.create_port.called) instance._get_private_router.assert_called_once_with( network_info['neutron_net_id'], network_info['neutron_subnet_id']) - service_instance.neutron.API.router_add_interface.\ - assert_called_once_with(router['id'], service_subnet['id']) + (service_instance.neutron.API.router_add_interface. + assert_called_once_with(router['id'], service_subnet['id'])) def test_setup_network_using_router_addon_of_interface_failed(self): network_info = dict( @@ -1816,8 +1816,8 @@ class NeutronNetworkHelperTestCase(test.TestCase): instance._get_service_subnet.assert_called_once_with(mock.ANY) instance._get_private_router.assert_called_once_with( network_info['neutron_net_id'], network_info['neutron_subnet_id']) - service_instance.neutron.API.router_add_interface.\ - assert_called_once_with(router['id'], service_subnet['id']) + (service_instance.neutron.API.router_add_interface. + assert_called_once_with(router['id'], service_subnet['id'])) def test_setup_network_using_router_connectivity_verification_fail(self): admin_project_id = 'fake_admin_project_id' @@ -1859,16 +1859,16 @@ class NeutronNetworkHelperTestCase(test.TestCase): self.assertRaises( exception.ManilaException, instance.setup_network, network_info) - instance.setup_connectivity_with_service_instances.\ - assert_called_once_with() + (instance.setup_connectivity_with_service_instances. + assert_called_once_with()) instance._get_service_subnet.assert_called_once_with(mock.ANY) instance._get_cidr_for_subnet.assert_called_once_with() self.assertTrue(service_instance.neutron.API.subnet_create.called) self.assertTrue(service_instance.neutron.API.create_port.called) instance._get_private_router.assert_called_once_with( network_info['neutron_net_id'], network_info['neutron_subnet_id']) - service_instance.neutron.API.router_add_interface.\ - assert_called_once_with(router['id'], service_subnet['id']) + (service_instance.neutron.API.router_add_interface. + assert_called_once_with(router['id'], service_subnet['id'])) service_instance.neutron.API.delete_port.assert_has_calls([ mock.call(self.service_port['id'])]) diff --git a/manila/tests/share/test_api.py b/manila/tests/share/test_api.py index 125a06a57d..bab06575d7 100644 --- a/manila/tests/share/test_api.py +++ b/manila/tests/share/test_api.py @@ -708,9 +708,9 @@ class ShareAPITestCase(test.TestCase): self.api.create_instance(self.context, share) - self.api.scheduler_rpcapi.create_share_instance.\ + (self.api.scheduler_rpcapi.create_share_instance. assert_called_once_with( - self.context, request_spec=mock.ANY, filter_properties={}) + self.context, request_spec=mock.ANY, filter_properties={})) self.assertFalse(self.api.share_rpcapi.create_share_instance.called) def test_create_instance_share_group_snapshot_member(self): @@ -1432,8 +1432,8 @@ class ShareAPITestCase(test.TestCase): self.api.delete_share_server(self.context, server) db_api.share_instances_get_all_by_share_server.assert_called_once_with( self.context, server['id']) - db_api.share_group_get_all_by_share_server.\ - assert_called_once_with(self.context, server['id']) + (db_api.share_group_get_all_by_share_server. + assert_called_once_with(self.context, server['id'])) self.share_rpcapi.delete_share_server.assert_called_once_with( self.context, server_returned) @@ -1463,8 +1463,8 @@ class ShareAPITestCase(test.TestCase): db_api.share_instances_get_all_by_share_server.assert_called_once_with( self.context, server['id']) - db_api.share_group_get_all_by_share_server.\ - assert_called_once_with(self.context, server['id']) + (db_api.share_group_get_all_by_share_server. + assert_called_once_with(self.context, server['id'])) @mock.patch.object(db_api, 'share_snapshot_instance_update', mock.Mock()) def test_delete_snapshot(self): diff --git a/manila/tests/share/test_driver.py b/manila/tests/share/test_driver.py index 4626a228ce..fed846b50b 100644 --- a/manila/tests/share/test_driver.py +++ b/manila/tests/share/test_driver.py @@ -512,8 +512,8 @@ class ShareDriverTestCase(test.TestCase): share_driver.allocate_admin_network(ctxt, share_server) mock_get_admin_network_allocations_number.assert_called_once_with() - share_driver.admin_network_api.allocate_network.\ - assert_called_once_with(ctxt, share_server, count=1) + (share_driver.admin_network_api.allocate_network. + assert_called_once_with(ctxt, share_server, count=1)) def test_allocate_admin_network_count_1_api_not_initialized(self): share_driver = self._instantiate_share_driver(None, True, None) diff --git a/manila/tests/share/test_manager.py b/manila/tests/share/test_manager.py index a36e0c6079..e01805d752 100644 --- a/manila/tests/share/test_manager.py +++ b/manila/tests/share/test_manager.py @@ -175,13 +175,13 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.init_host() self.assertTrue(self.share_manager.driver.initialized) - self.share_manager.db.share_instances_get_all_by_host.\ + (self.share_manager.db.share_instances_get_all_by_host. assert_called_once_with(utils.IsAMatcher(context.RequestContext), - self.share_manager.host) + self.share_manager.host)) self.share_manager.driver.do_setup.assert_called_once_with( utils.IsAMatcher(context.RequestContext)) - self.share_manager.driver.check_for_setup_error.\ - assert_called_once_with() + (self.share_manager.driver.check_for_setup_error. + assert_called_once_with()) @ddt.data( "connection_get_info", @@ -318,9 +318,9 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.init_host() # verification of call - self.share_manager.db.share_instances_get_all_by_host.\ + (self.share_manager.db.share_instances_get_all_by_host. assert_called_once_with(utils.IsAMatcher(context.RequestContext), - self.share_manager.host) + self.share_manager.host)) exports_update = self.share_manager.db.share_export_locations_update exports_update.assert_has_calls([ mock.call(mock.ANY, instances[0]['id'], fake_export_locations), @@ -328,8 +328,8 @@ class ShareManagerTestCase(test.TestCase): ]) self.share_manager.driver.do_setup.assert_called_once_with( utils.IsAMatcher(context.RequestContext)) - self.share_manager.driver.check_for_setup_error.\ - assert_called_once_with() + (self.share_manager.driver.check_for_setup_error. + assert_called_once_with()) self.share_manager._ensure_share_instance_has_pool.assert_has_calls([ mock.call(utils.IsAMatcher(context.RequestContext), instances[0]), mock.call(utils.IsAMatcher(context.RequestContext), instances[2]), @@ -344,9 +344,9 @@ class ShareManagerTestCase(test.TestCase): mock.call(utils.IsAMatcher(context.RequestContext), instances[2], share_server=share_server), ]) - self.share_manager.publish_service_capabilities.\ + (self.share_manager.publish_service_capabilities. assert_called_once_with( - utils.IsAMatcher(context.RequestContext)) + utils.IsAMatcher(context.RequestContext))) self.share_manager.access_helper.update_access_rules.assert_has_calls([ mock.call(mock.ANY, instances[4]['id'], share_server=share_server), ]) @@ -376,9 +376,9 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.init_host() # verification of call - self.share_manager.db.share_instances_get_all_by_host.\ + (self.share_manager.db.share_instances_get_all_by_host. assert_called_once_with(utils.IsAMatcher(context.RequestContext), - self.share_manager.host) + self.share_manager.host)) self.share_manager.driver.do_setup.assert_called_once_with( utils.IsAMatcher(context.RequestContext)) self.share_manager.driver.check_for_setup_error.assert_called_with() @@ -396,9 +396,9 @@ class ShareManagerTestCase(test.TestCase): mock.call(utils.IsAMatcher(context.RequestContext), instances[2], share_server=share_server), ]) - self.share_manager.publish_service_capabilities.\ + (self.share_manager.publish_service_capabilities. assert_called_once_with( - utils.IsAMatcher(context.RequestContext)) + utils.IsAMatcher(context.RequestContext))) manager.LOG.info.assert_any_call( mock.ANY, {'task': constants.TASK_STATE_MIGRATION_IN_PROGRESS, @@ -438,9 +438,9 @@ class ShareManagerTestCase(test.TestCase): smanager.init_host() # verification of call - smanager.db.share_instances_get_all_by_host.\ + (smanager.db.share_instances_get_all_by_host. assert_called_once_with(utils.IsAMatcher(context.RequestContext), - smanager.host) + smanager.host)) smanager.driver.do_setup.assert_called_once_with( utils.IsAMatcher(context.RequestContext)) smanager.driver.check_for_setup_error.assert_called_with() @@ -458,9 +458,9 @@ class ShareManagerTestCase(test.TestCase): mock.call(utils.IsAMatcher(context.RequestContext), instances[2], share_server=share_server), ]) - self.share_manager.publish_service_capabilities.\ + (self.share_manager.publish_service_capabilities. assert_called_once_with( - utils.IsAMatcher(context.RequestContext)) + utils.IsAMatcher(context.RequestContext))) manager.LOG.info.assert_any_call( mock.ANY, {'task': constants.TASK_STATE_MIGRATION_IN_PROGRESS, @@ -1769,12 +1769,12 @@ class ShareManagerTestCase(test.TestCase): self.context, fake_share.instance['id'], ) - db.share_server_get_all_by_host_and_share_net_valid.\ + (db.share_server_get_all_by_host_and_share_net_valid. assert_called_once_with( utils.IsAMatcher(context.RequestContext), self.share_manager.host, fake_share['share_network_id'], - ) + )) db.share_server_create.assert_called_once_with( utils.IsAMatcher(context.RequestContext), mock.ANY) db.share_instance_update.assert_has_calls([ @@ -2137,8 +2137,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.manage_share, self.context, share_id, driver_options) - self.share_manager.driver.manage_existing.\ - assert_called_once_with(mock.ANY, driver_options) + (self.share_manager.driver.manage_existing. + assert_called_once_with(mock.ANY, driver_options)) self.share_manager.db.share_update.assert_called_once_with( utils.IsAMatcher(context.RequestContext), share_id, @@ -2163,8 +2163,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.manage_share, self.context, share_id, driver_options) - self.share_manager.driver.manage_existing.\ - assert_called_once_with(mock.ANY, driver_options) + (self.share_manager.driver.manage_existing. + assert_called_once_with(mock.ANY, driver_options)) self.share_manager.db.share_update.assert_called_once_with( utils.IsAMatcher(context.RequestContext), share_id, {'status': constants.STATUS_MANAGE_ERROR, 'size': 1}) @@ -2190,8 +2190,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.manage_share, self.context, share_id, driver_options) - self.share_manager.driver.manage_existing.\ - assert_called_once_with(mock.ANY, driver_options) + (self.share_manager.driver.manage_existing. + assert_called_once_with(mock.ANY, driver_options)) self.share_manager.db.share_update.assert_called_once_with( mock.ANY, share_id, {'status': constants.STATUS_MANAGE_ERROR, 'size': 1}) @@ -2226,13 +2226,13 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.manage_share(self.context, share_id, driver_options) - self.share_manager.driver.manage_existing.\ - assert_called_once_with(mock.ANY, driver_options) + (self.share_manager.driver.manage_existing. + assert_called_once_with(mock.ANY, driver_options)) if export_locations: - self.share_manager.db.share_export_locations_update.\ + (self.share_manager.db.share_export_locations_update. assert_called_once_with( utils.IsAMatcher(context.RequestContext), - share.instance['id'], export_locations, delete=True) + share.instance['id'], export_locations, delete=True)) else: self.assertFalse( self.share_manager.db.share_export_locations_update.called) @@ -2328,8 +2328,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.unmanage_share(self.context, share_id) - self.share_manager.driver.unmanage.\ - assert_called_once_with(mock.ANY) + (self.share_manager.driver.unmanage. + assert_called_once_with(mock.ANY)) self.share_manager.db.share_instance_delete.assert_called_once_with( mock.ANY, share_instance_id) @@ -2344,8 +2344,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.unmanage_share(self.context, share['id']) - self.share_manager.driver.unmanage.\ - assert_called_once_with(mock.ANY) + (self.share_manager.driver.unmanage. + assert_called_once_with(mock.ANY)) self.share_manager.db.share_instance_delete.assert_called_once_with( mock.ANY, share_instance_id) @@ -2628,7 +2628,7 @@ class ShareManagerTestCase(test.TestCase): network_info) self.share_manager.driver.setup_server.assert_called_once_with( network_info, metadata=metadata) - self.share_manager.db.share_server_backend_details_set.\ + (self.share_manager.db.share_server_backend_details_set. assert_has_calls([ mock.call(self.context, share_server['id'], {'security_service_' + sec_services[0]['type']: @@ -2640,7 +2640,7 @@ class ShareManagerTestCase(test.TestCase): {'security_service_' + sec_services[2]['type']: jsonutils.dumps(sec_services[2])}), mock.call(self.context, share_server['id'], server_info), - ]) + ])) self.share_manager.db.share_server_update.assert_called_once_with( self.context, share_server['id'], {'status': constants.STATUS_ACTIVE}) @@ -2734,9 +2734,9 @@ class ShareManagerTestCase(test.TestCase): # verify results if detail_data_proper: - self.share_manager.db.share_server_backend_details_set.\ + (self.share_manager.db.share_server_backend_details_set. assert_called_once_with( - self.context, share_server['id'], server_info) + self.context, share_server['id'], server_info)) self.share_manager._form_server_setup_info.assert_called_once_with( self.context, share_server, share_network) self.share_manager.db.share_server_update.assert_called_once_with( @@ -2887,11 +2887,11 @@ class ShareManagerTestCase(test.TestCase): self.context, fake_share_server, fake_share_network) self.assertEqual(expected, network_info) - self.share_manager.db.network_allocations_get_for_share_server.\ + (self.share_manager.db.network_allocations_get_for_share_server. assert_has_calls([ mock.call(self.context, fake_share_server['id'], label='user'), mock.call(self.context, fake_share_server['id'], label='admin') - ]) + ])) @ddt.data( {'network_info': {'network_type': 'vlan', 'segmentation_id': '100'}}, @@ -3315,8 +3315,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.create_share_group(self.context, "fake_id") - self.share_manager.db.share_group_update.\ - assert_any_call(mock.ANY, 'fake_id', {'foo': 'bar'}) + (self.share_manager.db.share_group_update. + assert_any_call(mock.ANY, 'fake_id', {'foo': 'bar'})) self.share_manager.db.share_group_update.assert_any_call( mock.ANY, 'fake_id', { 'status': constants.STATUS_AVAILABLE, @@ -4090,8 +4090,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.migration_wait_access_rules_timeout) if exc is None: - self.share_manager.driver.connection_get_info.\ - assert_called_once_with(self.context, instance, server) + (self.share_manager.driver.connection_get_info. + assert_called_once_with(self.context, instance, server)) rpcapi.ShareAPI.connection_get_info.assert_called_once_with( self.context, new_instance) data_rpc.DataAPI.migration_start.assert_called_once_with( @@ -4676,9 +4676,10 @@ class ShareManagerTestCase(test.TestCase): assert_called_once_with(self.context, share, instance['id'], helper=helper, supress_errors=cancelled)) if status == constants.TASK_STATE_MIGRATION_CANCELLED: - self.share_manager.db.share_instance_update.\ - assert_called_once_with(self.context, instance['id'], - {'status': constants.STATUS_AVAILABLE}) + (self.share_manager.db.share_instance_update. + assert_called_once_with( + self.context, instance['id'], + {'status': constants.STATUS_AVAILABLE})) self.share_manager.db.share_update.assert_called_once_with( self.context, share['id'], {'task_state': constants.TASK_STATE_MIGRATION_CANCELLED}) @@ -4847,8 +4848,8 @@ class ShareManagerTestCase(test.TestCase): self.share_manager.db.share_update.assert_called_once_with( self.context, share['id'], {'task_state': constants.TASK_STATE_MIGRATION_COMPLETING}) - migration_api.ShareMigrationHelper.apply_new_access_rules.\ - assert_called_once_with(new_instance) + (migration_api.ShareMigrationHelper.apply_new_access_rules. + assert_called_once_with(new_instance)) delete_mock.assert_called_once_with(instance) @ddt.data(constants.TASK_STATE_MIGRATION_DRIVER_IN_PROGRESS, diff --git a/manila/tests/test_manager.py b/manila/tests/test_manager.py index 25e874dc80..fb08c7e291 100644 --- a/manila/tests/test_manager.py +++ b/manila/tests/test_manager.py @@ -110,9 +110,9 @@ class SchedulerDependentManagerTestCase(test.TestCase): self.sched_manager._publish_service_capabilities(self.context) - self.sched_manager.scheduler_rpcapi.update_service_capabilities.\ + (self.sched_manager.scheduler_rpcapi.update_service_capabilities. assert_called_once_with( - self.context, self.service_name, self.host, last_capabilities) + self.context, self.service_name, self.host, last_capabilities)) manager.LOG.debug.assert_called_once_with(mock.ANY) @ddt.data(None, '', [], {}, {'foo': 'bar'}) diff --git a/manila/tests/volume/test_cinder.py b/manila/tests/volume/test_cinder.py index ea32c11402..c95516d682 100644 --- a/manila/tests/volume/test_cinder.py +++ b/manila/tests/volume/test_cinder.py @@ -263,14 +263,14 @@ class CinderApiTestCase(test.TestCase): def test_initialize_connection(self): self.mock_object(self.cinderclient.volumes, 'initialize_connection') self.api.initialize_connection(self.ctx, 'id1', 'connector') - self.cinderclient.volumes.initialize_connection.\ - assert_called_once_with('id1', 'connector') + (self.cinderclient.volumes.initialize_connection. + assert_called_once_with('id1', 'connector')) def test_terminate_connection(self): self.mock_object(self.cinderclient.volumes, 'terminate_connection') self.api.terminate_connection(self.ctx, 'id1', 'connector') - self.cinderclient.volumes.terminate_connection.\ - assert_called_once_with('id1', 'connector') + (self.cinderclient.volumes.terminate_connection. + assert_called_once_with('id1', 'connector')) def test_delete(self): self.mock_object(self.cinderclient.volumes, 'delete')