Skip to content

Commit 2af413a

Browse files
Add Landscape client subordinate charm test (#411)
1 parent ba81fd2 commit 2af413a

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ jobs:
9090
"GCP_ACCESS_KEY": "${{ secrets.GCP_ACCESS_KEY }}",
9191
"GCP_SECRET_KEY": "${{ secrets.GCP_SECRET_KEY }}",
9292
"UBUNTU_PRO_TOKEN" : "${{ secrets.UBUNTU_PRO_TOKEN }}",
93+
"LANDSCAPE_ACCOUNT_NAME": "${{ secrets.LANDSCAPE_ACCOUNT_NAME }}",
94+
"LANDSCAPE_REGISTRATION_KEY": "${{ secrets.LANDSCAPE_REGISTRATION_KEY }}",
9395
}
9496
permissions:
9597
contents: write # Needed for Allure Report beta

tests/integration/test_subordinate_charms.py

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from .relations.test_database import APPLICATION_APP_NAME, CLUSTER_NAME, DATABASE_APP_NAME, TIMEOUT
1111

1212
UBUNTU_PRO_APP_NAME = "ubuntu-advantage"
13+
LANDSCAPE_CLIENT_APP_NAME = "landscape-client"
1314

1415

1516
@pytest.mark.group(1)
@@ -37,11 +38,32 @@ async def test_ubuntu_pro(ops_test, mysql_charm_series, github_secrets):
3738
await ops_test.model.relate(
3839
f"{DATABASE_APP_NAME}:database", f"{APPLICATION_APP_NAME}:database"
3940
)
40-
await ops_test.model.relate(f"{DATABASE_APP_NAME}", f"{UBUNTU_PRO_APP_NAME}")
41+
await ops_test.model.relate(DATABASE_APP_NAME, UBUNTU_PRO_APP_NAME)
4142
async with ops_test.fast_forward("60s"):
4243
await ops_test.model.wait_for_idle(
4344
apps=[DATABASE_APP_NAME, APPLICATION_APP_NAME, UBUNTU_PRO_APP_NAME],
4445
status="active",
4546
raise_on_blocked=True,
4647
timeout=TIMEOUT,
4748
)
49+
50+
51+
@pytest.mark.group(1)
52+
async def test_landscape_client(ops_test, github_secrets):
53+
await ops_test.model.deploy(
54+
LANDSCAPE_CLIENT_APP_NAME,
55+
application_name=LANDSCAPE_CLIENT_APP_NAME,
56+
channel="latest/edge",
57+
config={
58+
"account-name": github_secrets["LANDSCAPE_ACCOUNT_NAME"],
59+
"registration-key": github_secrets["LANDSCAPE_REGISTRATION_KEY"],
60+
},
61+
)
62+
await ops_test.model.relate(DATABASE_APP_NAME, LANDSCAPE_CLIENT_APP_NAME)
63+
async with ops_test.fast_forward("60s"):
64+
await ops_test.model.wait_for_idle(
65+
apps=[DATABASE_APP_NAME, APPLICATION_APP_NAME, LANDSCAPE_CLIENT_APP_NAME],
66+
status="active",
67+
raise_on_blocked=True,
68+
timeout=TIMEOUT,
69+
)

0 commit comments

Comments
 (0)