Merge ~dashmage/charm-nagios:bseng-1605/fix-lint-error into charm-nagios:master

[Ashley James]

Fix lint and functional test errors

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

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:9f076cac3e17a041ed7c45c96f24af68f5ee8044
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1905/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/569/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/4//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:601f670331ac37101f8f56e55003bc6976f9b4c6
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/5/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1910/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/574/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/5//rebuild

review: Approve (continuous-integration)

[Eric Chen (eric-chen)]

LGTM

review: Approve

[Tianqi Xiao (txiao)]

LGTM

review: Approve

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

Change successfully merged at revision d4a96aea3d9ea9f6c8b16f793f5daefa99f8009e

diff --git a/hooks/monitors_relation_changed.py b/hooks/monitors_relation_changed.py
index 1bf0ac3..0bdb0cc 100755
--- a/hooks/monitors_relation_changed.py
+++ b/hooks/monitors_relation_changed.py
@@ -289,7 +289,7 @@ def apply_relation_config(units, all_hosts, new_file_set):  # noqa: C901
         # this to its own private-address
         target_address = relation_settings.get("target-address")
 
-        if type(monitors) != dict:
+        if not isinstance(monitors, dict):
             monitors = yaml.safe_load(monitors)
 
         # Output nagios config
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
index e7321c7..f21d419 100644
--- a/tests/functional/conftest.py
+++ b/tests/functional/conftest.py
@@ -222,14 +222,16 @@ async def relatives(model, series):
         "ch:" + nrpe, application_name=nrpe_name, series=series, config={}, num_units=0
     )
 
-    mysql = "mysql"
-
-    if series != "trusty":
-        mysql = "percona-cluster"
+    mysql = "percona-cluster"
+    channel = "5.7/stable"
 
     mysql_name = "mysql-{}".format(series)
     mysql_app = await model.deploy(
-        "ch:" + mysql, application_name=mysql_name, series=series, config={}
+        "ch:" + mysql,
+        application_name=mysql_name,
+        series=series,
+        config={},
+        channel=channel,
     )
 
     await model.add_relation(