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

Do not load zyppnotify file on module import

Browse source 
The call imp.load_source() could fail (i.e. when the specified
zyppnotify does not exist). To prevent an import failure in that case,
move the loading of the zyppnotify file into the test case.

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
This commit is contained in:
Benjamin Drung 2019-02-08 10:51:05 +01:00
parent c6dfded555
commit 7678c28be7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/unit/test_zypp_plugins.py
View file

@ -25,8 +25,10 @@ if sys.version_info >= (3,):
else:
BUILTINS_OPEN = '__builtin__.open'
zyppnotify = imp.load_source('zyppnotify', os.path.sep.join(os.path.dirname(__file__).split(
os.path.sep)[:-2] + ['scripts', 'suse', 'zypper', 'plugins', 'commit', 'zyppnotify']))
ZYPPNOTIFY_FILE = os.path.sep.join(
os.path.dirname(__file__).split(os.path.sep)[:-2] +
['scripts', 'suse', 'zypper', 'plugins', 'commit', 'zyppnotify']
)
@skipIf(NO_MOCK, NO_MOCK_REASON)
@ -40,6 +42,7 @@ class ZyppPluginsTestCase(TestCase):
Returns:
'''
zyppnotify = imp.load_source('zyppnotify', ZYPPNOTIFY_FILE)
drift = zyppnotify.DriftDetector()
drift._get_mtime = MagicMock(return_value=123)
drift._get_checksum = MagicMock(return_value='deadbeef')