valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed pylint

Browse Source
This commit is contained in:
Alexandru Bleotu 2016-12-12 05:56:13 -05:00
parent b2f9d1eb4b
commit ded7ff9adb
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/vsphere.py
View File

@ -265,7 +265,7 @@ def gets_service_instance_via_proxy(fn):
@wraps(fn)
def _gets_service_instance_via_proxy(*args, **kwargs):
if not 'service_instance' in arg_names and not kwargs_name:
if 'service_instance' not in arg_names and not kwargs_name:
raise CommandExecutionError(
'Function {0} must have either a \'service_instance\', or a '
'\'**kwargs\' type parameter'.format(fn_name))

10
tests/unit/modules/vsphere_test.py
View File

@ -36,6 +36,7 @@ mock_si = MagicMock()
vsphere.__pillar__ = {}
vsphere.__salt__ = {}
@skipIf(NO_MOCK, NO_MOCK_REASON)
@patch('salt.modules.vsphere.__virtual__', MagicMock(return_value='vsphere'))
class VsphereTestCase(TestCase):
@ -682,6 +683,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
def test___get_proxy_connection_details_call(self):
mock__get_proxy_connection_details = MagicMock()
@vsphere.gets_service_instance_via_proxy
def mock_function(service_instance=None):
return service_instance
@ -694,6 +696,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
def test_service_instance_named_parameter_no_value(self):
mock_get_service_instance = MagicMock(return_value=self.mock_si)
mock_disconnect = MagicMock()
@vsphere.gets_service_instance_via_proxy
def mock_function(service_instance=None):
return service_instance
@ -713,6 +716,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
def test_service_instance_kwargs_parameter_no_value(self):
mock_get_service_instance = MagicMock(return_value=self.mock_si)
mock_disconnect = MagicMock()
@vsphere.gets_service_instance_via_proxy
def mock_function(**kwargs):
return kwargs['service_instance']
@ -732,6 +736,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
def test_service_instance_positional_parameter_no_default_value(self):
mock_get_service_instance = MagicMock()
mock_disconnect = MagicMock()
@vsphere.gets_service_instance_via_proxy
def mock_function(service_instance):
return service_instance
@ -750,6 +755,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
def test_service_instance_positional_parameter_with_default_value(self):
mock_get_service_instance = MagicMock()
mock_disconnect = MagicMock()
@vsphere.gets_service_instance_via_proxy
def mock_function(service_instance=None):
return service_instance
@ -768,6 +774,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
def test_service_instance_named_parameter_with_default_value(self):
mock_get_service_instance = MagicMock()
mock_disconnect = MagicMock()
@vsphere.gets_service_instance_via_proxy
def mock_function(service_instance=None):
return service_instance
@ -786,6 +793,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
def test_service_instance_kwargs_parameter_passthrough(self):
mock_get_service_instance = MagicMock()
mock_disconnect = MagicMock()
@vsphere.gets_service_instance_via_proxy
def mock_function(**kwargs):
return kwargs['service_instance']
@ -805,7 +813,7 @@ class GetsServiceInstanceViaProxyTestCase(TestCase):
@skipIf(NO_MOCK, NO_MOCK_REASON)
@patch('salt.modules.vsphere.__virtual__', MagicMock(return_value='vsphere'))
# Decorator mocks
@patch('salt.modules.vsphere.get_proxy_type',MagicMock(return_value='esxi'))
@patch('salt.modules.vsphere.get_proxy_type', MagicMock(return_value='esxi'))
@patch('salt.modules.vsphere._get_proxy_connection_details', MagicMock())
@patch('salt.utils.vmware.get_service_instance',
MagicMock(return_value=mock_si))