diff options
Diffstat (limited to 'test/units/mock/loader.py')
-rw-r--r-- | test/units/mock/loader.py | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/test/units/mock/loader.py b/test/units/mock/loader.py index f6ceb37..9dc32ca 100644 --- a/test/units/mock/loader.py +++ b/test/units/mock/loader.py @@ -21,16 +21,15 @@ __metaclass__ = type import os -from ansible.errors import AnsibleParserError from ansible.parsing.dataloader import DataLoader -from ansible.module_utils._text import to_bytes, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_text class DictDataLoader(DataLoader): def __init__(self, file_mapping=None): file_mapping = {} if file_mapping is None else file_mapping - assert type(file_mapping) == dict + assert isinstance(file_mapping, dict) super(DictDataLoader, self).__init__() @@ -48,11 +47,7 @@ class DictDataLoader(DataLoader): # TODO: the real _get_file_contents returns a bytestring, so we actually convert the # unicode/text it's created with to utf-8 def _get_file_contents(self, file_name): - path = to_text(file_name) - if path in self._file_mapping: - return to_bytes(self._file_mapping[file_name]), False - else: - raise AnsibleParserError("file not found: %s" % file_name) + return to_bytes(self._file_mapping[file_name]), False def path_exists(self, path): path = to_text(path) @@ -91,25 +86,6 @@ class DictDataLoader(DataLoader): self._add_known_directory(dirname) dirname = os.path.dirname(dirname) - def push(self, path, content): - rebuild_dirs = False - if path not in self._file_mapping: - rebuild_dirs = True - - self._file_mapping[path] = content - - if rebuild_dirs: - self._build_known_directories() - - def pop(self, path): - if path in self._file_mapping: - del self._file_mapping[path] - self._build_known_directories() - - def clear(self): - self._file_mapping = dict() - self._known_directories = [] - def get_basedir(self): return os.getcwd() |