cloud-init

Merge ~powersj/cloud-init:cii-fix-console-log into cloud-init:master

  1. Git
  2. lp:~powersj/cloud-init
  3. cii-fix-console-log
  4. Merge into master
Proposed by Joshua Powers on 2017-12-11
Status: Merged
Approved by: Scott Moser on 2017-12-11
Approved revision: 053198f2bdfea4203181ad72a9c63ccdbbe943a0
Merged at revision: b63ee73da874de68ff2019570e12df2a39d4626b
Proposed branch: ~powersj/cloud-init:cii-fix-console-log
Merge into: cloud-init:master
Diff against target: 14 lines (+2/-2)
1 file modified
tests/cloud_tests/collect.py (+2/-2)
Reviewer Review Type Date Requested Status
Scott Moser 2017-12-11 Approve on 2017-12-11
Review via email: mp+335052@code.launchpad.net

Commit Message

tests: fix collect_console when not implemented

The exception was incorrectly creating a string and not a bytes object.

To post a comment you must log in.
Scott Moser (smoser) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/cloud_tests/collect.py b/tests/cloud_tests/collect.py
2index 4805cea..bb72245 100644
3--- a/tests/cloud_tests/collect.py
4+++ b/tests/cloud_tests/collect.py
5@@ -31,8 +31,8 @@ def collect_console(instance, base_dir):
6 LOG.debug('getting console log')
7 try:
8 data = instance.console_log()
9- except NotImplementedError as e:
10- data = 'Not Implemented: %s' % e
11+ except NotImplementedError:
12+ data = b'instance.console_log: not implemented'
13 with open(os.path.join(base_dir, 'console.log'), "wb") as fp:
14 fp.write(data)
15

Subscribers

People subscribed via source and target branches