Skip to content

Commit

Permalink
Merge branch 'main' into dpe-2789-update-dpw
Browse files Browse the repository at this point in the history
  • Loading branch information
dragomirp committed Oct 26, 2023
2 parents 27497c5 + f8772a1 commit 6a616e7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tests/integration/new_relations/test_new_relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,14 @@ async def test_deploy_charms(ops_test: OpsTest, charm):
application_name=DATABASE_APP_NAME,
num_units=1,
series=CHARM_SERIES,
config={"profile": "testing"},
),
ops_test.model.deploy(
charm,
application_name=ANOTHER_DATABASE_APP_NAME,
num_units=2,
series=CHARM_SERIES,
config={"profile": "testing"},
),
)

Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_backups.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ async def test_backup(ops_test: OpsTest, cloud_configs: Tuple[Dict, Dict]) -> No
application_name=database_app_name,
num_units=2,
series=CHARM_SERIES,
config={"profile": "testing"},
)
await ops_test.model.relate(database_app_name, S3_INTEGRATOR_APP_NAME)
await ops_test.model.relate(database_app_name, TLS_CERTIFICATES_APP_NAME)
Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ async def test_deploy(ops_test: OpsTest, charm: str):
application_name=DATABASE_APP_NAME,
num_units=3,
series=CHARM_SERIES,
config={"profile": "testing"},
)

# Reducing the update status frequency to speed up the triggering of deferred events.
Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_db_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ async def test_landscape_scalable_bundle_db(ops_test: OpsTest, charm: str) -> No
application_name=DATABASE_APP_NAME,
num_units=DATABASE_UNITS,
series=CHARM_SERIES,
config={"profile": "testing"},
)

# Deploy and test the Landscape Scalable bundle (using this PostgreSQL charm).
Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ async def test_plugins(ops_test: OpsTest) -> None:
charm,
num_units=2,
series=CHARM_SERIES,
config={"profile": "testing"},
)
await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active")

Expand Down

0 comments on commit 6a616e7

Please sign in to comment.