Merge lp:~michael.nelson/charm-helpers/missing-import-for-ansible-helpers into lp:charm-helpers

Proposed by Michael Nelson
Status: Merged
Merged at revision: 101
Proposed branch: lp:~michael.nelson/charm-helpers/missing-import-for-ansible-helpers
Merge into: lp:charm-helpers
Diff against target: 11 lines (+1/-0)
1 file modified
charmhelpers/contrib/ansible/__init__.py (+1/-0)
To merge this branch: bzr merge lp:~michael.nelson/charm-helpers/missing-import-for-ansible-helpers
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+195967@code.launchpad.net

Commit message

Missing import for ansible support.

Description of the change

I noticed an error while testing the latest support and the result was the missing import below.

How did the tests pass?

On current trunk, running `make test` or `nosetests tests` passes, BUT, running `nosetests tests/contrib/ansible` shows the errors.

At first I thought it was a patch not being stopped after a test, but on investigation, it turned out to be that the test would pass as long as charmhelpers.contrib.saltstack was loaded, because *it* imports charmhelpers.contrib.templating.contexts.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/ansible/__init__.py'
2--- charmhelpers/contrib/ansible/__init__.py 2013-11-20 10:05:22 +0000
3+++ charmhelpers/contrib/ansible/__init__.py 2013-11-20 14:26:24 +0000
4@@ -62,6 +62,7 @@
5 import os
6 import subprocess
7
8+import charmhelpers.contrib.templating.contexts
9 import charmhelpers.core.host
10 import charmhelpers.core.hookenv
11 import charmhelpers.fetch

Subscribers

People subscribed via source and target branches