Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pkg installed flag fix #53080

Merged
merged 13 commits into from
May 21, 2019
Merged

Pkg installed flag fix #53080

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8306db2
Listen to extra flags when running pkg.installed.
May 16, 2019
c474879
listen to extra flags when running pkg.install
May 17, 2019
23cc723
listen to extra flags when running pkg.installed
May 17, 2019
e104cbf
listen to extra_install_flags and test
May 20, 2019
68e1e2e
Update test_win_pkg.py
cmcmarrow May 20, 2019
10d8654
listen to extra_install_flags and test
May 20, 2019
3f86909
Merge branch 'pkg_installed_flag_fix' of https://github.com/cmcmarrow…
May 20, 2019
7b18f9d
listen to extra_install_flags and test
May 20, 2019
92b5c42
listen to extra_install_flag fix and test
May 20, 2019
48d8f27
listen to extra_install_flag fix and test
May 20, 2019
91a5cbd
listen to extra_install_flag fix and test
May 20, 2019
3f651cf
Update test_win_pkg.py
cmcmarrow May 20, 2019
f159c6e
Update test_win_pkg.py
cmcmarrow May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions salt/modules/win_pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,11 @@ def install(name=None, refresh=False, pkgs=None, **kwargs):
'extra_install_flags': kwargs.get('extra_install_flags')
}
}
elif len(pkg_params) == 1:
# A dict of packages was passed, but it contains only 1 key, so we need
# to add the 'extra_install_flags'
for pkg in pkg_params:
cmcmarrow marked this conversation as resolved.
Show resolved Hide resolved
pkg_params[pkg]['extra_install_flags'] = kwargs.get('extra_install_flags')

# Get a list of currently installed software for comparison at the end
old = list_pkgs(saltenv=saltenv, refresh=refresh, versions_as_list=True)
Expand Down
69 changes: 68 additions & 1 deletion tests/unit/modules/test_win_pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.mock import MagicMock, patch
from tests.support.unit import TestCase
from tests.support.unit import TestCase, skipIf

# Import Salt Libs
import salt.modules.pkg_resource as pkg_resource
import salt.modules.win_pkg as win_pkg
import salt.utils.data
import salt.utils.platform


@skipIf(not salt.utils.platform.is_windows(), "Must be on Windows")
class WinPkgInstallTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.win_pkg
Expand Down Expand Up @@ -151,3 +154,67 @@ def test_pkg_install_existing_with_version(self):
expected = {}
result = win_pkg.install(name='nsis', version='3.03')
self.assertDictEqual(expected, result)

def test_pkg_install_name(self):
'''
test pkg.install name extra_install_flags
'''

ret__get_package_info = {'3.03': {'uninstaller': '%program.exe', 'reboot': False,
'msiexec': False,
'installer': 'runme.exe',
'uninstall_flags': '/S', 'locale': 'en_US', 'install_flags': '/s',
'full_name': 'Firebox 3.03 (x86 en-US)'}}

mock_cmd_run_all = MagicMock(return_value={'retcode': 0})
with patch.object(salt.utils.data, 'is_true', MagicMock(return_value=True)),\
patch.object(win_pkg, '_get_package_info', MagicMock(return_value=ret__get_package_info)),\
patch.dict(win_pkg.__salt__, {'pkg_resource.parse_targets':
MagicMock(return_value=[{'firebox': '3.03'}, None]),
'cp.is_cached':
MagicMock(return_value='C:\\fake\\path.exe'),
'cmd.run_all': mock_cmd_run_all}):
ret = win_pkg.install(name='firebox', version='3.03', extra_install_flags='-e True -test_flag True')
self.assertTrue('-e True -test_flag True' in str(mock_cmd_run_all.call_args[0]))

def test_pkg_install_single_pkg(self):
'''
test pkg.install pkg with extra_install_flags
'''
ret__get_package_info = {'3.03': {'uninstaller': '%program.exe', 'reboot': False,
'msiexec': False,
'installer': 'runme.exe',
'uninstall_flags': '/S', 'locale': 'en_US', 'install_flags': '/s',
'full_name': 'Firebox 3.03 (x86 en-US)'}}

mock_cmd_run_all = MagicMock(return_value={'retcode': 0})
with patch.object(salt.utils.data, 'is_true', MagicMock(return_value=True)), \
patch.object(win_pkg, '_get_package_info', MagicMock(return_value=ret__get_package_info)), \
patch.dict(win_pkg.__salt__, {'pkg_resource.parse_targets':
MagicMock(return_value=[{'firebox': '3.03'}, None]),
'cp.is_cached':
MagicMock(return_value='C:\\fake\\path.exe'),
'cmd.run_all': mock_cmd_run_all}):
ret = win_pkg.install(pkgs=['firebox'], version='3.03', extra_install_flags='-e True -test_flag True')
self.assertTrue('-e True -test_flag True' in str(mock_cmd_run_all.call_args[0]))

def test_pkg_install_multiple_pkgs(self):
'''
test pkg.install pkg with extra_install_flags
'''
ret__get_package_info = {'3.03': {'uninstaller': '%program.exe', 'reboot': False,
'msiexec': False,
'installer': 'runme.exe',
'uninstall_flags': '/S', 'locale': 'en_US', 'install_flags': '/s',
'full_name': 'Firebox 3.03 (x86 en-US)'}}

mock_cmd_run_all = MagicMock(return_value={'retcode': 0})
with patch.object(salt.utils.data, 'is_true', MagicMock(return_value=True)), \
patch.object(win_pkg, '_get_package_info', MagicMock(return_value=ret__get_package_info)), \
patch.dict(win_pkg.__salt__, {'pkg_resource.parse_targets':
MagicMock(return_value=[{'firebox': '3.03', 'got': '3.03'}, None]),
'cp.is_cached':
MagicMock(return_value='C:\\fake\\path.exe'),
'cmd.run_all': mock_cmd_run_all}):
ret = win_pkg.install(pkgs=['firebox', 'got'], extra_install_flags='-e True -test_flag True')
self.assertFalse('-e True -test_flag True' in str(mock_cmd_run_all.call_args[0]))