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

Proposed by Mert Kirpici
Status: Merged
Approved by: Ramesh Sattaru
Approved revision: 8ed0811fcb70446e02cec6bc415f5104dad33a36
Merged at revision: b491a004baaecc5d8fe97e6a48bd3ad1323b5a70
Proposed branch: ~mertkirpici/charm-nagios:lp/1998094
Merge into: charm-nagios:master
Diff against target: 58 lines (+6/-5)
3 files modified
tests/functional/conftest.py (+3/-3)
tests/functional/test_config.py (+1/-1)
tox.ini (+2/-1)
Reviewer Review Type Date Requested Status
Ramesh Sattaru (community) Approve
prod-jenkaas-bootstack (community) continuous-integration Approve
Eric Chen Approve
BootStack Reviewers Pending
Review via email: mp+433774@code.launchpad.net

Commit message

Close LP #1998094

Description of the change

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

To post a comment you must log in.
Revision history for this message
Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Ramesh Sattaru (rameshcan) :
review: Approve
Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ramesh Sattaru (rameshcan) :
review: Approve
Revision history for this message
Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision b491a004baaecc5d8fe97e6a48bd3ad1323b5a70

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
2index 92b2373..e7321c7 100644
3--- a/tests/functional/conftest.py
4+++ b/tests/functional/conftest.py
5@@ -129,7 +129,7 @@ async def run_command(get_unit):
6 """
7 unit = target if type(target) is juju.unit.Unit else await get_unit(target)
8 action = await unit.run(cmd)
9-
10+ await action.wait()
11 return action.results
12
13 return _run_command
14@@ -147,7 +147,7 @@ async def file_stat(run_command):
15 cmd = STAT_FILE % path
16 results = await run_command(cmd, target)
17
18- return json.loads(results["Stdout"])
19+ return json.loads(results["stdout"])
20
21 return _file_stat
22
23@@ -165,7 +165,7 @@ async def file_contents(run_command):
24 cmd = "cat {}".format(path)
25 results = await run_command(cmd, target)
26
27- return results.get("Stdout")
28+ return results.get("stdout")
29
30 return _file_contents
31
32diff --git a/tests/functional/test_config.py b/tests/functional/test_config.py
33index 9f2259b..634822d 100644
34--- a/tests/functional/test_config.py
35+++ b/tests/functional/test_config.py
36@@ -151,7 +151,7 @@ async def test_livestatus_xinetd(unit, livestatus_path, livestatus_socket, run_c
37 out = await run_command(
38 "echo -e 'GET hosts\nColumns: name\n' | nc 127.0.0.1 6557", unit.u
39 )
40- assert "nagios" in out["Stdout"], "Livestatus output is not expected"
41+ assert "nagios" in out["stdout"], "Livestatus output is not expected"
42
43
44 async def test_pager_duty(unit, enable_pagerduty, file_stat):
45diff --git a/tox.ini b/tox.ini
46index e77c968..b02fdb0 100644
47--- a/tox.ini
48+++ b/tox.ini
49@@ -44,7 +44,8 @@ exclude =
50 mod,
51 .build,
52 bin
53-ignore = # TODO remove most of these
54+ignore =
55+ # TODO remove most of these
56 D100,
57 D101,
58 D102,

Subscribers

People subscribed via source and target branches

to all changes: