Merge lp:~niedbalski/charm-helpers/fix-lp1255933 into lp:charm-helpers

[Jorge Niedbalski]

Fix bug LP: #1255933

[lp:~niedbalski/charm-helpers/fix-lp1255933]

261. By Tom Haddon on 2014-11-26

[gnuoy,r=mthaddon] add default servicegroup of 'juju' to nagios config if one isn't defined

262. By Jorge Niedbalski on 2014-12-03

[corey.bryant r=niedbalski] Added git support for openstack utils

263. By Jorge Niedbalski on 2014-12-04

[tests] added test for hookenv.log with passing object

[Felipe Reyes (freyes)]

Jorge, LGTM.

Best,

review: Approve

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2014-11-25 15:07:02 +0000
+++ charmhelpers/core/hookenv.py	2014-12-04 18:12:36 +0000
@@ -68,6 +68,8 @@
     command = ['juju-log']
     if level:
         command += ['-l', level]
+    if not isinstance(message, six.string_types):
+        message = repr(message)
     command += [message]
     subprocess.call(command)
 

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2014-12-03 13:27:17 +0000
+++ charmhelpers/core/host.py	2014-12-04 18:12:36 +0000
@@ -388,8 +388,8 @@
 
     '''
     import apt_pkg
-    from charmhelpers.fetch import apt_cache
     if not pkgcache:
+        from charmhelpers.fetch import apt_cache
         pkgcache = apt_cache()
     pkg = pkgcache[package]
     return apt_pkg.version_compare(pkg.current_ver.ver_str, revno)

=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2014-11-25 15:07:02 +0000
+++ tests/core/test_hookenv.py	2014-12-04 18:12:36 +0000
@@ -233,6 +233,11 @@
         mock_call.assert_called_with(['juju-log', 'foo'])
 
     @patch('subprocess.call')
+    def test_logs_messages_object(self, mock_call):
+        hookenv.log(object)
+        mock_call.assert_called_with(['juju-log', "<class 'object'>"])
+
+    @patch('subprocess.call')
     def test_logs_messages_with_alternative_levels(self, mock_call):
         alternative_levels = [
             hookenv.CRITICAL,