Merge ~afreiberger/charm-graylog:blacken-20.10 into charm-graylog:master

Proposed by Drew Freiberger
Status: Merged
Merged at revision: e62ae269ed78c602b7444b91c51dd35ac4b9b24d
Proposed branch: ~afreiberger/charm-graylog:blacken-20.10
Merge into: charm-graylog:master
Diff against target: 15 lines (+3/-1)
1 file modified
src/tests/functional/tests/test_graylog_upgrade.py (+3/-1)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Review via email: mp+392309@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alvaro Uria (aluria) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/functional/tests/test_graylog_upgrade.py b/src/tests/functional/tests/test_graylog_upgrade.py
2index 2160414..ed6358d 100644
3--- a/src/tests/functional/tests/test_graylog_upgrade.py
4+++ b/src/tests/functional/tests/test_graylog_upgrade.py
5@@ -146,7 +146,9 @@ class UpgradeTest(unittest.TestCase):
6 model.set_application_config("graylog", {"channel": "fake"})
7 for unit_name in self.unit_names:
8 self._block_until(
9- unit_name, "blocked", "Invalid snap channel: fake",
10+ unit_name,
11+ "blocked",
12+ "Invalid snap channel: fake",
13 )
14
15 # Roll back

Subscribers

People subscribed via source and target branches

to all changes: