Merge lp:~freyes/charm-helpers/lp1593036 into lp:charm-helpers

[Felipe Reyes]

Dear Charmers,

This patch fixes the unit test suite for charmhelpers.contrib.network.ufw, this is done mocking charmhelpers.core.kernel.modprobe to make sure the behavior is consistent no matter the environment where the suite is being executed.

Best,

[Stuart Bishop (stub)]

Looks good, and the tests that were previously failing are now passing.

review: Approve

=== modified file 'tests/contrib/network/test_ufw.py'
--- tests/contrib/network/test_ufw.py	2015-09-03 14:22:08 +0000
+++ tests/contrib/network/test_ufw.py	2016-06-17 15:08:32 +0000
@@ -42,7 +42,8 @@
 class TestUFW(unittest.TestCase):
     @mock.patch('charmhelpers.core.hookenv.log')
     @mock.patch('subprocess.check_output')
-    def test_enable_ok(self, check_output, log):
+    @mock.patch('charmhelpers.contrib.network.ufw.modprobe')
+    def test_enable_ok(self, modprobe, check_output, log):
         msg = 'Firewall is active and enabled on system startup\n'
         check_output.return_value = msg
         self.assertTrue(ufw.enable())
@@ -56,7 +57,8 @@
 
     @mock.patch('charmhelpers.core.hookenv.log')
     @mock.patch('subprocess.check_output')
-    def test_enable_fail(self, check_output, log):
+    @mock.patch('charmhelpers.contrib.network.ufw.modprobe')
+    def test_enable_fail(self, modprobe, check_output, log):
         msg = 'neneene\n'
         check_output.return_value = msg
         self.assertFalse(ufw.enable())
@@ -307,7 +309,9 @@
     @mock.patch('os.path.isdir')
     @mock.patch('subprocess.call')
     @mock.patch('subprocess.check_output')
-    def test_no_ip6_tables(self, check_output, call, isdir, log, is_enabled):
+    @mock.patch('charmhelpers.contrib.network.ufw.modprobe')
+    def test_no_ip6_tables(self, modprobe, check_output, call, isdir, log,
+                           is_enabled):
         def c(*args, **kwargs):
             if args[0] == ['lsmod']:
                 return LSMOD_NO_IP6
@@ -395,7 +399,8 @@
     @mock.patch('charmhelpers.contrib.network.ufw.is_enabled')
     @mock.patch('os.path.isdir')
     @mock.patch('subprocess.check_output')
-    def test_with_ipv6(self, check_output, isdir, is_enabled, log):
+    @mock.patch('charmhelpers.contrib.network.ufw.modprobe')
+    def test_with_ipv6(self, modprobe, check_output, isdir, is_enabled, log):
         def c(*args, **kwargs):
             if args[0] == ['lsmod']:
                 return LSMOD_IP6