Juju Charm Tools

Merge lp:~marcoceppi/charm-tools/pep8-fix into lp:~charmers/charm-tools/trunk

  1. pep8-fix
  2. Merge into trunk
Proposed by Marco Ceppi
Status: Merged
Merged at revision: 172
Proposed branch: lp:~marcoceppi/charm-tools/pep8-fix
Merge into: lp:~charmers/charm-tools/trunk
Diff against target: 19 lines (+2/-0)
1 file modified
helpers/python/charmhelpers/tests/test_charmhelpers.py (+2/-0)
To merge this branch: bzr merge lp:~marcoceppi/charm-tools/pep8-fix
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+153585@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helpers/python/charmhelpers/tests/test_charmhelpers.py'
2--- helpers/python/charmhelpers/tests/test_charmhelpers.py 2013-02-25 21:40:13 +0000
3+++ helpers/python/charmhelpers/tests/test_charmhelpers.py 2013-03-15 15:57:22 +0000
4@@ -448,6 +448,7 @@
5 def test_log(self):
6 # The "log" function forwards a string on to the juju-log command.
7 logged = []
8+
9 def juju_log(*args):
10 logged.append(args)
11 charmhelpers.log('This is a log message', juju_log)
12@@ -463,6 +464,7 @@
13 # version of juju-log. Therefore we signfiy the end of options by
14 # inserting the string " -- " just before the log message.
15 logged = []
16+
17 def juju_log(*args):
18 logged.append(args)
19 charmhelpers.log('This is a log message', juju_log)

Subscribers

People subscribed via source and target branches