Merge lp:~gnuoy/charm-helpers/add-loglevel-context into lp:charm-helpers

[Liam Young]

[James Page (james-page)]

review: Needs Fixing

[lp:~gnuoy/charm-helpers/add-loglevel-context]

182. By Liam Young on 2014-07-24

Updated loglevel context to cope with variables being unset

[Liam Young (gnuoy)]

Updated to cope with variables being unset

review: Needs Resubmitting

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-07-03 12:36:50 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-07-24 08:23:59 +0000
@@ -728,6 +728,17 @@
         return ctxt
 
 
+class LogLevelContext(OSContextGenerator):
+
+    def __call__(self):
+        ctxt = {}
+        ctxt['debug'] = \
+            False if config('debug') is None else config('debug')
+        ctxt['verbose'] = \
+            False if config('verbose') is None else config('verbose')
+        return ctxt
+
+
 class SyslogContext(OSContextGenerator):
 
     def __call__(self):
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2014-07-16 15:02:59 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2014-07-24 08:23:59 +0000
@@ -1205,3 +1205,29 @@
             'use_syslog': 'foo',
         }
         self.assertEquals(result, expected)
+
+    def test_loglevel_context_set(self):
+        self.config.side_effect = fake_config({
+            'debug': True,
+            'verbose': True,
+        })
+        syslog = context.LogLevelContext()
+        result = syslog()
+        expected = {
+            'debug': True,
+            'verbose': True,
+        }
+        self.assertEquals(result, expected)
+
+    def test_loglevel_context_unset(self):
+        self.config.side_effect = fake_config({
+            'debug': None,
+            'verbose': None,
+        })
+        syslog = context.LogLevelContext()
+        result = syslog()
+        expected = {
+            'debug': False,
+            'verbose': False,
+        }
+        self.assertEquals(result, expected)