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

Merge pull request #34955 from lubyou/fix-dism-on-non-english-systems

Browse source 
force dism to always output english text
This commit is contained in:
Mike Place 2016-08-01 06:54:03 -06:00 • committed by GitHub
commit d137c4b986
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/win_dism.py
View file

@ -30,6 +30,7 @@ def __virtual__():
def _get_components(type_regex, plural_type, install_value, image=None):
cmd = ['DISM',
'/English',
'/Image:{0}'.format(image) if image else '/Online',
'/Get-{0}'.format(plural_type)]
out = __salt__['cmd.run'](cmd)
@ -162,6 +163,7 @@ def get_capabilities(image=None):
'Windows: {0}'.format(__grains__['osversion']))
cmd = ['DISM',
'/English',
'/Image:{0}'.format(image) if image else '/Online',
'/Get-Capabilities']
out = __salt__['cmd.run'](cmd)
@ -354,6 +356,7 @@ def get_features(package=None, image=None):
salt '*' dism.get_features Microsoft.Windows.Calc.Demo~6595b6144ccf1df~x86~en~1.0.0.0
'''
cmd = ['DISM',
'/English',
'/Image:{0}'.format(image) if image else '/Online',
'/Get-Features']
@ -546,6 +549,7 @@ def package_info(package, image=None):
salt '*' dism. package_info C:\\packages\\package.cab
'''
cmd = ['DISM',
'/English',
'/Image:{0}'.format(image) if image else '/Online',
'/Get-PackageInfo']

14
tests/unit/modules/win_dism_test.py
View file

@ -71,7 +71,7 @@ class WinDismTestCase(TestCase):
with patch.dict(dism.__grains__, {'osversion': 10}):
out = dism.get_capabilities()
mock.assert_called_once_with(
['DISM', '/Online', '/Get-Capabilities'])
['DISM', '/English', '/Online', '/Get-Capabilities'])
self.assertEqual(out, ['Capa1', 'Capa2'])
def test_installed_capabilities(self):
@ -86,7 +86,7 @@ class WinDismTestCase(TestCase):
with patch.dict(dism.__grains__, {'osversion': 10}):
out = dism.installed_capabilities()
mock.assert_called_once_with(
['DISM', '/Online', '/Get-Capabilities'])
['DISM', '/English', '/Online', '/Get-Capabilities'])
self.assertEqual(out, ["Capa1"])
def test_available_capabilities(self):
@ -101,7 +101,7 @@ class WinDismTestCase(TestCase):
with patch.dict(dism.__grains__, {'osversion': 10}):
out = dism.available_capabilities()
mock.assert_called_once_with(
['DISM', '/Online', '/Get-Capabilities'])
['DISM', '/English', '/Online', '/Get-Capabilities'])
self.assertEqual(out, ["Capa2"])
def test_add_feature(self):
@ -159,7 +159,7 @@ class WinDismTestCase(TestCase):
mock = MagicMock(return_value=features)
with patch.dict(dism.__salt__, {'cmd.run': mock}):
out = dism.get_features()
mock.assert_called_once_with(['DISM', '/Online', '/Get-Features'])
mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Features'])
self.assertEqual(out, ['Capa1', 'Capa2'])
def test_installed_features(self):
@ -172,7 +172,7 @@ class WinDismTestCase(TestCase):
mock = MagicMock(return_value=features)
with patch.dict(dism.__salt__, {'cmd.run': mock}):
out = dism.installed_features()
mock.assert_called_once_with(['DISM', '/Online', '/Get-Features'])
mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Features'])
self.assertEqual(out, ["Capa1"])
def test_available_features(self):
@ -185,7 +185,7 @@ class WinDismTestCase(TestCase):
mock = MagicMock(return_value=features)
with patch.dict(dism.__salt__, {'cmd.run': mock}):
out = dism.available_features()
mock.assert_called_once_with(['DISM', '/Online', '/Get-Features'])
mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Features'])
self.assertEqual(out, ["Capa2"])
def test_add_package(self):
@ -232,7 +232,7 @@ class WinDismTestCase(TestCase):
mock = MagicMock(return_value=features)
with patch.dict(dism.__salt__, {'cmd.run': mock}):
out = dism.installed_packages()
mock.assert_called_once_with(['DISM', '/Online', '/Get-Packages'])
mock.assert_called_once_with(['DISM', '/English', '/Online', '/Get-Packages'])
self.assertEqual(out, ['Capa1', 'Capa2'])
if __name__ == '__main__':