Merge pull request #51558 from bdrung/test-zypp-plugin

Do not load zyppnotify file on module import
This commit is contained in:
Daniel Wozniak 2019-02-12 21:16:34 -07:00 committed by GitHub
commit f87d5eccea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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')