mravi/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix test cdist_type.TypeTestCase.test_directory_in_default

Browse source
This commit is contained in:
Antoine Catton 2014-12-30 22:06:01 -07:00
commit 2318c792d7
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cdist/core/cdist_type.py
View file

@ -204,11 +204,13 @@ class CdistType(object):
try: try:
defaults_dir = os.path.join(self.absolute_path, "parameter", "default") defaults_dir = os.path.join(self.absolute_path, "parameter", "default")
for name in os.listdir(defaults_dir): for name in os.listdir(defaults_dir):
with open(os.path.join(defaults_dir, name)) as fd: try:
defaults[name] = fd.read().strip() with open(os.path.join(defaults_dir, name)) as fd:
defaults[name] = fd.read().strip()
except EnvironmentError:
pass # Swallow errors raised by open() or read()
except EnvironmentError: except EnvironmentError:
# error ignored pass # Swallow error raised by os.listdir()
pass
finally: finally:
self.__parameter_defaults = defaults self.__parameter_defaults = defaults
return self.__parameter_defaults return self.__parameter_defaults