Skip to content

Commit 7e29286

Browse files
committed
Update tests for bundle deployment
1 parent 6228649 commit 7e29286

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

tests/bundle/bundle.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
series: xenial
22
applications:
3-
wordpress:
4-
charm: "wordpress"
5-
series: "xenial"
6-
channel: "candidate"
3+
keystone:
4+
charm: "keystone"
5+
series: "focal"
6+
channel: "stable"
77
num_units: 1
88
annotations:
99
"gui-x": "339.5"
1010
"gui-y": "-171"
1111
to:
1212
- "0"
13-
mysql:
14-
charm: "mysql"
15-
series: "trusty"
16-
channel: "candidate"
13+
mysql-innodb:
14+
charm: "mysql-innodb-cluster"
15+
series: "jammy"
16+
channel: "stable"
1717
num_units: 1
1818
annotations:
1919
"gui-x": "79.5"
2020
"gui-y": "-142"
2121
to:
2222
- "1"
2323
relations:
24-
- - "wordpress:db"
25-
- "mysql:db"
24+
- - "keystone:shared-db"
25+
- "mysql-innodb:shared-db"
2626
machines:
2727
"0":
28-
series: xenial
28+
series: focal
2929
constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"
3030
"1":
31-
series: trusty
31+
series: jammy
3232
constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"

tests/integration/test_model.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ async def test_deploy_local_bundle_dir(event_loop):
4949
async with base.CleanModel() as model:
5050
await model.deploy(str(bundle_path))
5151

52-
wordpress = model.applications.get('wordpress')
53-
mysql = model.applications.get('mysql')
54-
assert wordpress and mysql
55-
await model.block_until(lambda: (len(wordpress.units) == 1 and
52+
keystone = model.applications.get('keystone')
53+
mysql = model.applications.get('mysql-innodb')
54+
assert keystone and mysql
55+
await model.block_until(lambda: (len(keystone.units) == 1 and
5656
len(mysql.units) == 1),
5757
timeout=60 * 4)
5858

0 commit comments

Comments
 (0)