Merge lp:~sseman/juju-chaos-monkey/force-enable into lp:juju-chaos-monkey

[Seman]

This branch adds --force when ufw enable and reset commands are executed. It also fixes the issue of killing jujud process instead of mongod process.

[John George (jog)]

Thank you

review: Approve

=== modified file 'chaos/kill.py'
--- chaos/kill.py	2015-05-11 08:12:38 +0000
+++ chaos/kill.py	2015-05-15 00:10:58 +0000
@@ -24,10 +24,10 @@
         return cls()
 
     def get_pids(self, process):
-        pids = run_shell_command('pidof ' + process)
+        pids = run_shell_command('pidof ' + process, quiet_mode=True)
         if not pids:
             return None
-        return pids.split(' ')
+        return pids.strip().split(' ')
 
     def kill_jujud(self, quiet_mode=True):
         pids = self.get_pids('jujud')
@@ -58,7 +58,7 @@
                 description='Jujud process has been killed.'))
         chaos.append(
             Chaos(
-                enable=self.kill_jujud,
+                enable=self.kill_mongodb,
                 disable=None,
                 group=self.group,
                 command_str='mongod',

=== modified file 'chaos/net.py'
--- chaos/net.py	2015-05-11 08:12:38 +0000
+++ chaos/net.py	2015-05-15 00:10:58 +0000
@@ -45,7 +45,7 @@
         return 'ufw delete deny out to any'
 
     def reset(self):
-        cmd = 'ufw reset'
+        cmd = 'ufw --force reset'
         self.run_command(cmd)
 
     def deny_all_incoming_and_outgoing_except_ssh(self):
@@ -101,7 +101,7 @@
         self.allow_port(6514)
 
     def enable_ufw(self):
-        cmd = 'ufw enable'
+        cmd = 'ufw --force enable'
         run_shell_command(cmd)
 
     def disable_ufw(self):

=== modified file 'tests/test_chaos_monkey.py'
--- tests/test_chaos_monkey.py	2015-05-12 06:06:59 +0000
+++ tests/test_chaos_monkey.py	2015-05-15 00:10:58 +0000
@@ -50,7 +50,7 @@
             cm.run_chaos('net', 'deny-state-server', timeout=0)
         self.assertEqual(mock.mock_calls, [
             call(['ufw', 'default', 'allow']),
-            call(['ufw', 'deny', '37017']), call(['ufw', 'enable']),
+            call(['ufw', 'deny', '37017']), call(['ufw', '--force', 'enable']),
             call(['ufw', 'delete', 'deny', '37017']),
             call(['ufw', 'disable'])])
 
@@ -90,7 +90,7 @@
             cm._run_command(chaos, timeout=0)
         self.assertEqual(mock.mock_calls, [
             call(['ufw', 'default', 'allow']),
-            call(['ufw', 'deny', '37017']), call(['ufw', 'enable']),
+            call(['ufw', 'deny', '37017']), call(['ufw', '--force', 'enable']),
             call(['ufw', 'delete', 'deny', '37017']),
             call(['ufw', 'disable'])])
 
@@ -98,7 +98,7 @@
         cm = ChaosMonkey.factory()
         with patch('utility.check_output', autospec=True) as mock:
             cm.shutdown()
-        mock.assert_any_call(['ufw', 'reset'])
+        mock.assert_any_call(['ufw', '--force', 'reset'])
 
     def test_include_group(self):
         group = ['net']

=== modified file 'tests/test_kill.py'
--- tests/test_kill.py	2015-05-12 05:59:22 +0000
+++ tests/test_kill.py	2015-05-15 00:10:58 +0000
@@ -1,3 +1,5 @@
+from subprocess import CalledProcessError
+
 from mock import patch, call
 
 from chaos.kill import Kill
@@ -12,37 +14,76 @@
     def test_get_pids(self):
         kill = Kill()
         with patch('utility.check_output', autospec=True,
-                   return_value='1234 2345') as mock:
+                   return_value='1234 2345\n') as mock:
             pids = kill.get_pids('jujud')
         self.assertEqual(pids, ['1234', '2345'])
         mock.assert_called_once_with(['pidof', 'jujud'])
 
+    def test_get_pids_no_process(self):
+        kill = Kill()
+        with patch('utility.check_output', autospec=True,
+                   side_effect=CalledProcessError(1, 'pidof fake')) as mock:
+            pids = kill.get_pids('fake')
+        self.assertEqual(pids, None)
+        mock.assert_called_once_with(['pidof', 'fake'])
+
     def test_kill_jujud(self):
         kill = Kill()
         with patch('utility.check_output', autospec=True,
-                   return_value='1234 2345') as mock:
+                   return_value='1234 2345\n') as mock:
             kill.kill_jujud()
         self.assertEqual(mock.mock_calls, [
             call(['pidof', 'jujud']),
             call(['kill', '-s', 'SIGKILL', '1234'])
         ])
 
+    def test_kill_jujud_single_process(self):
+        kill = Kill()
+        with patch('utility.check_output', autospec=True,
+                   return_value='2345\n') as mock:
+            kill.kill_jujud()
+        self.assertEqual(mock.mock_calls, [
+            call(['pidof', 'jujud']),
+            call(['kill', '-s', 'SIGKILL', '2345'])
+        ])
+
     def test_kill_mongodb(self):
         kill = Kill()
         with patch('utility.check_output', autospec=True,
-                   return_value='1234 2345') as mock:
+                   return_value='1234 2345\n') as mock:
             kill.kill_mongodb()
         self.assertEqual(mock.mock_calls, [
             call(['pidof', 'mongod']),
             call(['kill', '-s', 'SIGKILL', '1234'])
         ])
 
+    def test_kill_mongodb_single_process(self):
+        kill = Kill()
+        with patch('utility.check_output', autospec=True,
+                   return_value='2345\n') as mock:
+            kill.kill_mongodb()
+        self.assertEqual(mock.mock_calls, [
+            call(['pidof', 'mongod']),
+            call(['kill', '-s', 'SIGKILL', '2345'])
+        ])
+
     def test_get_chaos(self):
         kill = Kill()
         chaos = kill.get_chaos()
         self.assertItemsEqual(
             self.get_command_str(chaos), get_all_kill_commands())
 
+    def test_get_chaos_verify_method_calls(self):
+        kill = Kill()
+        chaos = kill.get_chaos()
+        for c in chaos:
+            if c.command_str == 'mongod':
+                self.assertEqual(c.enable, kill.kill_mongodb)
+            if c.command_str == 'jujud':
+                self.assertEqual(c.enable, kill.kill_jujud)
+            self.assertEqual(c.group, 'kill')
+            self.assertEqual(c.disable, None)
+
 
 def get_all_kill_commands():
     return ['jujud', 'mongod']

=== modified file 'tests/test_net.py'
--- tests/test_net.py	2015-05-12 05:59:22 +0000
+++ tests/test_net.py	2015-05-15 00:10:58 +0000
@@ -13,7 +13,8 @@
         self.setup_test_logging()
 
     def test_reset(self):
-        self._assert_mock_calls('shutdown', [call(['ufw', 'reset'])])
+        self._assert_mock_calls(
+            'shutdown', [call(['ufw', '--force', 'reset'])])
 
     def test_deny_all_incoming_and_outgoing_except_ssh(self):
         cmd = ['allow_ssh_str', 'default_deny_str', 'deny_out_to_any_str']
@@ -105,7 +106,8 @@
         self.assertEqual(chaos.description, 'description')
 
     def test_shutdown(self):
-        self._assert_mock_calls('shutdown', [call(['ufw', 'reset'])])
+        self._assert_mock_calls(
+            'shutdown', [call(['ufw', '--force', 'reset'])])
 
     def _assert_mock_calls(self, method_call, call_list, **kwargs):
         net = Net()
@@ -121,7 +123,7 @@
             cmd_calls = [call(getattr(net, attr).split(' ')) for attr in attrs]
         else:
             cmd_calls = [call(attrs.split(' '))]
-        enable_call = ([call(['ufw', 'enable'])]
+        enable_call = ([call(['ufw', '--force', 'enable'])]
                        if enable else [call(['ufw', 'disable'])])
         return default_allow_call + cmd_calls + enable_call