Merge lp:~billy-olsen/charms/trusty/mongodb/fix-unit-tests into lp:charms/trusty/mongodb

[Billy Olsen]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7096 mongodb for billy-olsen mp266140
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7096/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6594 mongodb for billy-olsen mp266140
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6594/

[Ryan Beisner (1chb1n)]

FYI Unit test full output: http://paste.ubuntu.com/11955246/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6595 mongodb for billy-olsen mp266140
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6595/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7097 mongodb for billy-olsen mp266140
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7097/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5440 mongodb for billy-olsen mp266140
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5440/

[Charles Butler (lazypower)]

Thanks for the contribution Billy, this LGTM. I'll defer to an OS Charmer to pull the trigger on making the merge.

[Charles Butler (lazypower)]

Per the comments from beisner on IRC i'm going to merge this. Thanks again for the contribution!

review: Approve

=== modified file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	2015-01-21 21:50:41 +0000
+++ unit_tests/test_hooks.py	2015-07-28 18:55:23 +0000
@@ -89,7 +89,6 @@
 
         hooks.init_replset()
 
-        mock_run_admin_command.assert_called()
         self.assertEqual(len(ret_values), mock_run_admin_command.call_count)
         self.assertEqual(len(ret_values) + 1, mock_sleep.call_count)
 
@@ -104,7 +103,6 @@
         except OperationFailure:
             pass
 
-        mock_run_admin_command.assert_called()
         self.assertEqual(2, mock_run_admin_command.call_count)
 
     @patch.object(hooks, 'mongo_client_smart')
@@ -197,7 +195,7 @@
         mock_run_admin_cmd.side_effect = OperationFailure('EMPTYCONFIG')
 
         rv = hooks.am_i_primary()
-        mock_run_admin_cmd.assert_called()
+        self.assertTrue(mock_run_admin_cmd.called)
         self.assertFalse(rv)
 
         mock_run_admin_cmd.reset_mock()
@@ -206,7 +204,7 @@
             hooks.am_i_primary()
             self.assertFalse(True, "Expected OperationFailure to be raised")
         except OperationFailure:
-            mock_run_admin_cmd.assert_called()
+            self.assertTrue(mock_run_admin_cmd.called)
 
     @patch('time.sleep')
     @patch('subprocess.check_output')
@@ -295,6 +293,7 @@
         self.assertEqual(1, mock_join_replset.call_count)
 
         # Test when not oldest peer, don't init replica set
+        mock_join_replset.reset_mock()
         mock_init_replset.reset_mock()
         mock_oldest_peer.reset_mock()
         mock_peer_units.return_value = ['mongodb/1', 'mongodb/2']
@@ -311,11 +310,12 @@
         mock_oldest_peer.return_value = False
         mock_is_primary.reset_mock()
         mock_is_primary.return_value = True
+        mock_join_replset.reset_mock()
 
         hooks.replica_set_relation_changed()
         call1 = call('juju-local-unit-0.local:27017',
                      'juju-remote-unit-0:12345')
-        mock_join_replset.assert_has_calls(call1)
+        mock_join_replset.assert_has_calls([call1])
 
     @patch.object(hooks, 'unit_get')
     @patch.object(hooks, 'leave_replset')
@@ -338,4 +338,4 @@
         hooks.replica_set_relation_departed()
 
         call1 = call('juju-local:27017', 'juju-remote:27017')
-        mock_leave_replset.assert_has_calls(call1)
+        mock_leave_replset.assert_has_calls([call1])