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

[Haw Loeung]

Fix issue with being stuck in maintenance status on setting up NRPE checks - LP:1945446

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

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

[Gareth Woolridge (moon127)]

Thanks for that fix!

review: Approve

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

Change successfully merged at revision 38e093ef3492335669f89a4ccd47865c09936fab

diff --git a/reactive/jenkins_slave.py b/reactive/jenkins_slave.py
index 314fbd0..dcb947d 100644
--- a/reactive/jenkins_slave.py
+++ b/reactive/jenkins_slave.py
@@ -115,6 +115,7 @@ def configure_jenkins_slave():
 @reactive.when_not('nagios-nrpe.configured')
 def configure_nagios(nagios):
     status.maintenance('setting up NRPE checks')
+    reactive.clear_flag('jenkins-slave.active')
 
     # Use charmhelpers.contrib.charmsupport's nrpe to determine hostname
     hostname = nrpe.get_nagios_hostname()
@@ -218,7 +219,7 @@ def slave_relation():
 
 
 def file_to_units(local_path, unit_path, perms=None, owner='root', group='root'):
-    """ copy a file from the charm onto our unit(s) """
+    """copy a file from the charm onto our unit(s)"""
     file_perms = perms
     if not perms:
         # Let's try manually work it out
diff --git a/tox.ini b/tox.ini
index 220ff5d..6e52aab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ setenv =
   PYTHONPATH = .
 
 [testenv:unit]
-commands = pytest -v --ignore {toxinidir}/tests/functional --cov=lib --cov=reactive --cov=actions --cov-report=term-missing --cov-branch
+commands = pytest -v --ignore {toxinidir}/tests/functional --cov=reactive --cov-report=term-missing --cov-branch
 deps = -r{toxinidir}/tests/unit/requirements.txt
 setenv = PYTHONPATH={toxinidir}/lib