Merge pull request #51728 from gtmanfred/virtualnames

fix modulenames from virtualnames tests
This commit is contained in:
Pedro Algarvio 2019-02-20 17:45:54 +00:00 committed by GitHub
commit f4adf33977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -8,7 +8,7 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Libs
import salt.modules.linux_sysctl as linux_sysctl
import salt.modules.systemd as systemd
import salt.modules.systemd_service as systemd
from salt.exceptions import CommandExecutionError
# Import Salt Testing Libs

View file

@ -16,7 +16,7 @@ from tests.support.mock import (
)
# Import Salt libs
import salt.modules.rpm
import salt.modules.rpm_lowpkg as rpm
import salt.modules.yumpkg as yumpkg
import salt.modules.pkg_resource as pkg_resource
@ -587,7 +587,7 @@ class YumTestCase(TestCase, LoaderModuleMockMixin):
})
salt_mock = {
'cmd.run_all': cmd_mock,
'lowpkg.version_cmp': salt.modules.rpm.version_cmp,
'lowpkg.version_cmp': rpm.version_cmp,
'pkg_resource.parse_targets': MagicMock(return_value=(
{name: new}, 'repository'
)),