This commit is contained in:
Scott Moser 2015-03-02 15:41:16 -05:00
parent af5c00b27a
commit 1191ec8f44
3 changed files with 3 additions and 2 deletions

View File

@ -185,6 +185,7 @@ def get_instance_metadata(api_version='latest',
caller = functools.partial(util.read_file_or_url,
ssl_details=ssl_details, timeout=timeout,
retries=retries)
def mcaller(url):
return caller(url).contents

View File

@ -346,7 +346,8 @@ class Init(object):
processed_vd = str(self.datasource.get_vendordata())
if processed_vd is None:
processed_vd = ''
util.write_file(self._get_ipath('vendordata'), str(processed_vd), 0o600)
util.write_file(self._get_ipath('vendordata'), str(processed_vd),
0o600)
def _default_handlers(self, opts=None):
if opts is None:

View File

@ -58,7 +58,6 @@ def gzip_text(text):
return contents.getvalue()
# FIXME: these tests shouldn't be checking log output??
# Weirddddd...
class TestConsumeUserData(helpers.FilesystemMockingTestCase):