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

Refactor: Cleanup and pylint fixes

Browse source
This commit is contained in:
Pablo Suárez Hernández 2016-10-19 14:57:03 +01:00
parent 1331ae5c72
commit a092a974da
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/modules/zypper.py
View file

@ -1106,30 +1106,27 @@ def upgrade(refresh=True,
'comment': '',
}
cmd_update = ['dist-upgrade'] if dist_upgrade else ['update']
cmd_update.extend(['--auto-agree-with-licenses'])
cmd_update = (['dist-upgrade'] if dist_upgrade else ['update']) + ['--auto-agree-with-licenses']
if refresh:
refresh_db()
if dryrun:
cmd_update.extend(['--dry-run'])
cmd_update.append('--dry-run')
if dist_upgrade:
if dryrun:
# Creates a solver test case for debugging.
log.info('Executing debugsolver and performing a dry-run dist-upgrade')
cmd_debugsolver = cmd_update + ['--debug-solver']
__zypper__.noraise.call(*cmd_debugsolver)
__zypper__.noraise.call(*cmd_update + ['--debug-solver'])
if fromrepo:
fromrepoopt = ['--from', fromrepo]
cmd_update.extend(['--from', fromrepo])
log.info('Targeting repo {0!r}'.format(fromrepo))
cmd_update.extend(fromrepoopt)
if novendorchange:
cmd_update.append('--no-allow-vendor-change')
log.info('Disabling changes of vendor')
cmd_update.extend(['--no-allow-vendor-change'])
old = list_pkgs()
__zypper__(systemd_scope=_systemd_scope()).noraise.call(*cmd_update)

10
tests/unit/modules/zypper_test.py
View file

@ -393,11 +393,11 @@ Repository 'DUMMY' not found by its alias, number, or URI.
with patch('salt.modules.zypper.__zypper__', FailingZypperDummy()) as zypper_mock:
zypper_mock.noraise.call = MagicMock()
with patch('salt.modules.zypper.list_pkgs', MagicMock(side_effect=[{"vim": "1.1"}, {"vim": "1.1"}])):
ret = zypper.upgrade(dist_upgrade=True, fromrepo="DUMMY")
self.assertFalse(ret['result'])
self.assertEqual(ret['comment'], zypper_out.strip())
self.assertDictEqual(ret['changes'], {})
zypper_mock.noraise.call.assert_called_with('dist-upgrade', '--auto-agree-with-licenses', '--from', 'DUMMY')
ret = zypper.upgrade(dist_upgrade=True, fromrepo="DUMMY")
self.assertFalse(ret['result'])
self.assertEqual(ret['comment'], zypper_out.strip())
self.assertDictEqual(ret['changes'], {})
zypper_mock.noraise.call.assert_called_with('dist-upgrade', '--auto-agree-with-licenses', '--from', 'DUMMY')
@patch('salt.modules.zypper.refresh_db', MagicMock(return_value=True))
def test_upgrade_available(self):