Skip to content

Commit 580f231

Browse files
committed
Update and fix up some test cases
1 parent 74d5ed3 commit 580f231

3 files changed

Lines changed: 13 additions & 18 deletions

File tree

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
name: simple
22
summary: A simple example charm with the new operator framework
33
description: |
4-
Simple is an example charm
5-
series:
6-
- xenial
7-
- bionic
4+
Simple is an example charm
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
series: bionic
21
saas:
3-
mysql:
4-
url: admin/{}.mysql
2+
influxdb:
3+
url: admin/{}.influxdb
54
applications:
6-
wordpress:
7-
charm: wordpress
5+
grafana:
6+
charm: grafana
87
channel: stable
98
num_units: 1
109
relations:
11-
- - wordpress:db
12-
- mysql:db
10+
- - grafana:grafana-source
11+
- influxdb:grafana-source

tests/integration/test_crossmodel.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,20 +165,19 @@ async def test_add_bundle(event_loop):
165165
raise
166166

167167
await model_1.deploy(
168-
'mysql',
169-
application_name='mysql',
170-
series='xenial',
168+
'influxdb',
169+
application_name='influxdb',
171170
channel='stable',
172171
)
173-
assert 'mysql' in model_1.applications
172+
assert 'influxdb' in model_1.applications
174173
await model_1.wait_for_idle(status="active")
175174

176-
await model_1.create_offer("mysql:db")
175+
await model_1.create_offer("influxdb:grafana-source")
177176

178177
offers = await model_1.list_offers()
179178

180179
await model_1.block_until(
181-
lambda: all(offer.application_name == 'mysql'
180+
lambda: all(offer.application_name == 'influxdb'
182181
for offer in offers.results),
183182
timeout=60 * wait_for_min)
184183

@@ -187,4 +186,4 @@ async def test_add_bundle(event_loop):
187186
await model_2.deploy('local:{}'.format(tmp_path))
188187
await model_2.wait_for_idle(status="active")
189188

190-
await model_1.remove_offer("admin/{}.mysql".format(model_1.info.name), force=True)
189+
await model_1.remove_offer("admin/{}.influxdb".format(model_1.info.name), force=True)

0 commit comments

Comments
 (0)