Merge ~mertkirpici/charm-nagios:lp/1998094 into charm-nagios:master

[Mert Kirpici]

Close LP #1998094

flake8 6.0.0 does not like it when the inline comments are on the same
line as the ignored rule.

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

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

[Ramesh Sattaru (rameshcan)]

review: Approve

[Eric Chen (eric-chen)]

review: Approve

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

FAILED: Continuous integration, rev:8ed0811fcb70446e02cec6bc415f5104dad33a36
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/74/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1473/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1724/

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:8ed0811fcb70446e02cec6bc415f5104dad33a36
https://jenkins.canonical.com/bootstack/job/lp-charm-nagios-ci/75/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1475/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1726/

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

review: Approve (continuous-integration)

[Ramesh Sattaru (rameshcan)]

review: Approve

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

Change successfully merged at revision b491a004baaecc5d8fe97e6a48bd3ad1323b5a70

diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
index 92b2373..e7321c7 100644
--- a/tests/functional/conftest.py
+++ b/tests/functional/conftest.py
@@ -129,7 +129,7 @@ async def run_command(get_unit):
         """
         unit = target if type(target) is juju.unit.Unit else await get_unit(target)
         action = await unit.run(cmd)
-
+        await action.wait()
         return action.results
 
     return _run_command
@@ -147,7 +147,7 @@ async def file_stat(run_command):
         cmd = STAT_FILE % path
         results = await run_command(cmd, target)
 
-        return json.loads(results["Stdout"])
+        return json.loads(results["stdout"])
 
     return _file_stat
 
@@ -165,7 +165,7 @@ async def file_contents(run_command):
         cmd = "cat {}".format(path)
         results = await run_command(cmd, target)
 
-        return results.get("Stdout")
+        return results.get("stdout")
 
     return _file_contents
 
diff --git a/tests/functional/test_config.py b/tests/functional/test_config.py
index 9f2259b..634822d 100644
--- a/tests/functional/test_config.py
+++ b/tests/functional/test_config.py
@@ -151,7 +151,7 @@ async def test_livestatus_xinetd(unit, livestatus_path, livestatus_socket, run_c
     out = await run_command(
         "echo -e 'GET hosts\nColumns: name\n' | nc 127.0.0.1 6557", unit.u
     )
-    assert "nagios" in out["Stdout"], "Livestatus output is not expected"
+    assert "nagios" in out["stdout"], "Livestatus output is not expected"
 
 
 async def test_pager_duty(unit, enable_pagerduty, file_stat):
diff --git a/tox.ini b/tox.ini
index e77c968..b02fdb0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,7 +44,8 @@ exclude =
     mod,
     .build,
     bin
-ignore =  # TODO remove most of these
+ignore =
+    # TODO remove most of these
     D100,
     D101,
     D102,