cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:cii-fix-console-log into cloud-init:master.

Commit message:
tests: fix collect_console when not implemented
    
The exception was incorrectly creating a string and not a bytes object.


Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/335052
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~powersj/cloud-init:cii-fix-console-log into cloud-init:master.

diff --git a/tests/cloud_tests/collect.py b/tests/cloud_tests/collect.py
index 4805cea..bb72245 100644
--- a/tests/cloud_tests/collect.py
+++ b/tests/cloud_tests/collect.py
@@ -31,8 +31,8 @@ def collect_console(instance, base_dir):
     LOG.debug('getting console log')
     try:
         data = instance.console_log()
-    except NotImplementedError as e:
-        data = 'Not Implemented: %s' % e
+    except NotImplementedError:
+        data = b'instance.console_log: not implemented'
     with open(os.path.join(base_dir, 'console.log'), "wb") as fp:
         fp.write(data)