Skip to content

Commit 4a7cb19

Browse files
committed
Fix test_deploy_bundle_with_multiple_overlays_with_include_files
1 parent 1d56446 commit 4a7cb19

4 files changed

Lines changed: 10 additions & 18 deletions

File tree

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
series: jammy
22
applications:
3-
ghost:
4-
charm: "prometheus"
3+
grafana:
4+
charm: "grafana"
55
channel: stable
66
num_units: 1
7-
mysql:
7+
prometheus:
88
charm: "prometheus"
99
channel: stable
1010
num_units: 1
1111
test:
1212
charm: "./tests/integration/charm"
1313
relations:
14-
- ["prometheus:grafana-source", "grafana:grafana-source"]
14+
- ["prometheus:grafana-source", "grafana:grafana-source"]

tests/integration/bundle/test-overlays/test-overlay2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
description: An overlay for the wiki-simple bundle to remove mysql and add memcached
22
applications:
33
test:
4-
mysql:
4+
prometheus:
55
memcached:
66
charm: "memcached"
77
channel: stable
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
description: Another overlay to remove memcached and add back the mysql and relate
1+
description: Another overlay to remove memcached
22
applications:
3-
memcached:
4-
ghost:
5-
options:
6-
config: include-file://config1.yaml
3+
memcached:

tests/integration/test_model.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,11 @@ async def test_deploy_bundle_with_multiple_overlays_with_include_files(event_loo
242242
overlay2_path = OVERLAYS_DIR / 'test-overlay3.yaml'
243243

244244
await model.deploy(str(bundle_yaml_path), overlays=[overlay1_path, overlay2_path])
245-
# the bundle : installs ghost, mysql and a local test charm
246-
# overlay1 : removes test, mysql, installs memcached
247-
# overlay2 : removes memcached, adds config to ghost with include-file
248-
assert 'mysql' not in model.applications
245+
246+
assert 'influxdb' not in model.applications
249247
assert 'test' not in model.applications
250248
assert 'memcached' not in model.applications
251-
assert 'ghost' in model.applications
252-
ghost = model.applications.get('ghost', None)
253-
assert ghost.config.get('port', None) == 2369
254-
assert ghost.config.get('url', "") == 'http://my-ghost.blg'
249+
assert 'grafana' in model.applications
255250

256251

257252
@base.bootstrapped

0 commit comments

Comments
 (0)