Browse Source

Merge "replace imp module"

changes/59/758759/2
Zuul 10 months ago
committed by Gerrit Code Review
parent
commit
3847aab594
  1. 20
      tests/test_hook_chef.py

20
tests/test_hook_chef.py

@ -12,11 +12,13 @@
# under the License.
import copy
import imp
import importlib
import json
import logging
import six
import sys
from multiprocessing import Lock
from unittest import mock
from tests import common
@ -24,6 +26,15 @@ from tests import common
log = logging.getLogger('test_hook_chef')
def load_module(name, path):
module_spec = importlib.util.spec_from_file_location(
name, path
)
module = importlib.util.module_from_spec(module_spec)
module_spec.loader.exec_module(module)
return module
@mock.patch("os.chdir")
@mock.patch("os.makedirs")
@mock.patch('subprocess.Popen')
@ -67,11 +78,12 @@ class HookChefTest(common.RunScriptTest):
sys.stdout = sys.__stdout__
def get_module(self):
lock = Lock()
try:
imp.acquire_lock()
return imp.load_source("hook_chef", self.hook_path)
lock.acquire()
return load_module("hook_chef", self.hook_path)
finally:
imp.release_lock()
lock.release()
def test_hook(self, mock_popen, mock_mkdirs, mock_chdir):
data = copy.deepcopy(self.data)

Loading…
Cancel
Save