Merge ~harlowja/cloud-init:space into cloud-init:master
Proposed by
Joshua Harlow
on 2016-08-01
| Status: | Merged |
|---|---|
| Merged at revision: | 6fce6db9a5fd75e2c398de0e0b4cd72a9f05a7a6 |
| Proposed branch: | ~harlowja/cloud-init:space |
| Merge into: | cloud-init:master |
| Diff against target: |
140 lines (+128/-0) 2 files modified
cloudinit/config/cc_spacewalk.py (+85/-0) tests/unittests/test_handler/test_handler_spacewalk.py (+43/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Scott Moser | 2016-08-01 | Needs Fixing on 2016-08-03 | |
|
Review via email:
|
|||
To post a comment you must log in.
| Scott Moser (smoser) wrote : | # |
review:
Needs Fixing
| Joshua Harlow (harlowja) wrote : | # |
done.
| Scott Moser (smoser) wrote : | # |
We have this block in a lot of places:
+try:
+ from unittest import mock
+except ImportError:
+ import mock
Why do we need it ? is it python2.6 ?
Can we / could we change this to just use helpers.mock ? and have helpers do the try/import ?


some test needed.
I'd suggest making 'handle' do very little other than call a helper that has sane function signatures.
i'm fine with it in principle.