|
10 | 10 | from .relations.test_database import APPLICATION_APP_NAME, CLUSTER_NAME, DATABASE_APP_NAME, TIMEOUT
|
11 | 11 |
|
12 | 12 | UBUNTU_PRO_APP_NAME = "ubuntu-advantage"
|
| 13 | +LANDSCAPE_CLIENT_APP_NAME = "landscape-client" |
13 | 14 |
|
14 | 15 |
|
15 | 16 | @pytest.mark.group(1)
|
@@ -37,11 +38,32 @@ async def test_ubuntu_pro(ops_test, mysql_charm_series, github_secrets):
|
37 | 38 | await ops_test.model.relate(
|
38 | 39 | f"{DATABASE_APP_NAME}:database", f"{APPLICATION_APP_NAME}:database"
|
39 | 40 | )
|
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) |
41 | 42 | async with ops_test.fast_forward("60s"):
|
42 | 43 | await ops_test.model.wait_for_idle(
|
43 | 44 | apps=[DATABASE_APP_NAME, APPLICATION_APP_NAME, UBUNTU_PRO_APP_NAME],
|
44 | 45 | status="active",
|
45 | 46 | raise_on_blocked=True,
|
46 | 47 | timeout=TIMEOUT,
|
47 | 48 | )
|
| 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