Merge ~hloeung/jenkins-agent-charm:master into jenkins-agent-charm:master

[Haw Loeung]

Add unit tests for configure_nagios()

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

I think these assertFalse calls don't do what you think they do. The assert methods raise an AssertionError exception when they fail; they do not return True/False.

review: Needs Fixing

[Stuart Bishop (stub)]

Yup. Missed one, but easy fix.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 3d304ebbb02d47f0a3cf1b70fa534052ea6c545d

diff --git a/reactive/jenkins_slave.py b/reactive/jenkins_slave.py
index 1d5c545..21d174c 100755
--- a/reactive/jenkins_slave.py
+++ b/reactive/jenkins_slave.py
@@ -12,6 +12,7 @@ def upgrade_charm():
     status.maintenance('forcing reconfiguration on upgrade-charm')
     reactive.clear_flag('jenkins-slave.active')
     reactive.clear_flag('jenkins-slave.installed')
+    reactive.clear_flag('nagios-nrpe.configured')
 
 
 @reactive.when_not('jenkins-slave.installed')
@@ -111,8 +112,8 @@ def blocked_on_jenkins_url():
 
 
 @reactive.when('jenkins-slave.configured')
[e-mail]('nrpe-external-master.available')
 @reactive.when('jenkins-slave.active')
[e-mail]('nrpe-external-master.available')
 @reactive.when_not('nagios-nrpe.configured')
 def configure_nagios(nagios):
     status.maintenance('setting up NRPE checks')
diff --git a/tests/unit/test_jenkins_slave.py b/tests/unit/test_jenkins_slave.py
index 9793742..5f8742a 100644
--- a/tests/unit/test_jenkins_slave.py
+++ b/tests/unit/test_jenkins_slave.py
@@ -83,7 +83,9 @@ class TestSetDefaultConf(unittest.TestCase):
         '''Test correct flags set via upgrade-charm hook'''
         jenkins_slave.upgrade_charm()
         self.assertFalse(status.maintenance.assert_called())
-        expected = [mock.call('jenkins-slave.active'), mock.call('jenkins-slave.installed')]
+        expected = [mock.call('jenkins-slave.active'),
+                    mock.call('jenkins-slave.installed'),
+                    mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
@@ -299,6 +301,23 @@ class TestSetDefaultConf(unittest.TestCase):
         jenkins_slave.slave_relation()
         self.assertFalse(clear_flag.assert_not_called())
 
+    @mock.patch('charms.reactive.set_flag')
+    @mock.patch('charmhelpers.contrib.charmsupport.nrpe.get_nagios_hostname')
+    @mock.patch('charmhelpers.contrib.charmsupport.nrpe.NRPE')
+    def test_configure_nagios(self, nrpe, get_nagios_hostname, set_flag):
+        get_nagios_hostname.return_value = 'some-host.local'
+        nrpe_instance_mock = nrpe(get_nagios_hostname(), primary=True)
+        jenkins_slave.configure_nagios(None)
+        status.maintenance.assert_called()
+        want = [mock.call('jenkins_slave_ps', 'Jenkins Slave Process',
+                          '/usr/lib/nagios/plugins/check_procs -c 1:1 -a slave.jar')]
+        nrpe_instance_mock.add_check.assert_has_calls(want, any_order=True)
+
+        nrpe_instance_mock.write.assert_called()
+
+        want = [mock.call('nagios-nrpe.configured')]
+        set_flag.assert_has_calls(want, any_order=True)
+
     def test_write_default_conf_update(self):
         jenkins_slave.write_default_conf('http://10.1.1.1:8080', self.user, self.group, self.conf_file)
         self.assertTrue(conf_match(self.conf_file, 'JENKINS_URL', 'http://10.1.1.1:8080'))