saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove redundent code... some more

Browse source
This commit is contained in:
twangboy 2020-03-11 13:17:28 -06:00
parent 1db3052b94
commit a7369e41d7
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/unit/modules/test_win_lgpo.py
View file

@ -17,6 +17,7 @@ from tests.support.unit import TestCase, skipIf
import salt.config
import salt.loader
import salt.modules.win_lgpo as win_lgpo
import salt.states.win_lgpo
import salt.utils.platform
import salt.utils.stringutils
@ -589,19 +590,6 @@ class WinLGPOGetPointAndPrintENTestCase(TestCase, LoaderModuleMockMixin):
win_lgpo.set_(computer_policy=computer_policy)
self.configured = True
def _convert_to_unicode(self, data):
if isinstance(data, six.string_types):
data = data.replace('\x00', '')
return salt.utils.stringutils.to_unicode(data)
elif isinstance(data, dict):
return dict((self._convert_to_unicode(k),
self._convert_to_unicode(v))
for k, v in data.items())
elif isinstance(data, list):
return list(self._convert_to_unicode(v) for v in data)
else:
return data
def _get_policy_adm_setting(self, policy_name, policy_class,
return_full_policy_names, hierarchical_return):
'''
@ -621,7 +609,7 @@ class WinLGPOGetPointAndPrintENTestCase(TestCase, LoaderModuleMockMixin):
hierarchical_return=hierarchical_return
)
if six.PY2:
results = self._convert_to_unicode(results)
results = salt.states.win_lgpo._convert_to_unicode(results)
return results
return 'Policy Not Found'