Merge ~addyess/charm-nagios:test/swap_mysql_to_percona into ~nagios-charmers/charm-nagios:master

Proposed by Adam Dyess
Status: Rejected
Rejected by: Giuseppe Petralia
Proposed branch: ~addyess/charm-nagios:test/swap_mysql_to_percona
Merge into: ~nagios-charmers/charm-nagios:master
Diff against target: 26 lines (+4/-4)
1 file modified
tests/functional/conftest.py (+4/-4)
Reviewer Review Type Date Requested Status
Paul Goins Needs Fixing
Drew Freiberger (community) Approve
Review via email: mp+387545@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Dyess (addyess) wrote :
Revision history for this message
Drew Freiberger (afreiberger) wrote :

lgtm

review: Approve
Revision history for this message
Paul Goins (vultaire) wrote :

I'm not sure the updated relations are correct. Manual testing in a test model gives me errors when I try to wire things in the way done here.

review: Needs Fixing
Revision history for this message
Giuseppe Petralia (peppepetra) wrote :

Unmerged commits

0f0ff98... by Adam Dyess

Change out mysql-charm to percona-cluster-charm

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
index fafe7f0..d607a62 100644
--- a/tests/functional/conftest.py
+++ b/tests/functional/conftest.py
@@ -200,8 +200,8 @@ async def relatives(model):
200200
201 mysql = "mysql"201 mysql = "mysql"
202 mysql_app = await model.deploy(202 mysql_app = await model.deploy(
203 'cs:' + mysql, application_name=mysql,203 'cs:percona-cluster', application_name=mysql,
204 series='trusty', config={}204 series='bionic', config={}
205 )205 )
206206
207 mediawiki = "mediawiki"207 mediawiki = "mediawiki"
@@ -237,8 +237,8 @@ async def deploy_app(relatives, model, series):
237 'enable_pagerduty': False237 'enable_pagerduty': False
238 }238 }
239 )239 )
240 await model.add_relation('{}:monitors'.format(app_name), 'mysql:monitors')240 for relative in relatives.keys():
241 await model.add_relation('{}:nagios'.format(app_name), 'mediawiki:juju-info')241 await model.add_relation(app_name + ':nagios', relative + ':juju-info')
242 await model.add_relation('nrpe:monitors', '{}:monitors'.format(app_name))242 await model.add_relation('nrpe:monitors', '{}:monitors'.format(app_name))
243 await model.block_until(lambda: nagios_app.status == "active")243 await model.block_until(lambda: nagios_app.status == "active")
244 await model.block_until(lambda: all(244 await model.block_until(lambda: all(

Subscribers

People subscribed via source and target branches