diff --git a/tests/integration/test_charm_ambient.py b/tests/integration/test_charm_ambient.py index a2d382f8..2ea395e1 100644 --- a/tests/integration/test_charm_ambient.py +++ b/tests/integration/test_charm_ambient.py @@ -410,25 +410,12 @@ async def test_mlflow_bucket_exists(self, ops_test): @pytest.mark.abort_on_fail async def test_deploy_data_integrator(self, ops_test: OpsTest): """Deploy a data-integrator instance, for user grants in subsequent tests.""" - # TODO: remove this command and restore the command below once - # https://github.com/canonical/data-integrator/pull/328 lands on main, that is on channel - # "latest/edge", and mind that an explicit Juju-CLI deploy is temporarily required because - # python-libjuju's `Model.deploy()` breaks with this temporary channel format: - await ops_test.juju( - "deploy", + await ops_test.model.deploy( DATA_INTEGRATOR.charm, - "--trust", - "--channel", - "latest/edge/mlflow-client", - "--revision", - "521", + channel=DATA_INTEGRATOR.channel, + config=DATA_INTEGRATOR.config, + trust=DATA_INTEGRATOR.trust, ) - # await ops_test.model.deploy( - # DATA_INTEGRATOR.charm, - # channel=DATA_INTEGRATOR.channel, - # config=DATA_INTEGRATOR.config, - # trust=DATA_INTEGRATOR.trust, - # ) await ops_test.model.wait_for_idle( apps=[DATA_INTEGRATOR.charm], status="blocked", timeout=600, idle_period=60 ) diff --git a/tests/integration/test_charm_object_storage.py b/tests/integration/test_charm_object_storage.py index 67e91813..c2398261 100644 --- a/tests/integration/test_charm_object_storage.py +++ b/tests/integration/test_charm_object_storage.py @@ -400,25 +400,12 @@ async def test_mlflow_bucket_exists(self, ops_test): @pytest.mark.abort_on_fail async def test_deploy_data_integrator(self, ops_test: OpsTest): """Deploy a data-integrator instance, for user grants in subsequent tests.""" - # TODO: remove this command and restore the command below once - # https://github.com/canonical/data-integrator/pull/328 lands on main, that is on channel - # "latest/edge", and mind that an explicit Juju-CLI deploy is temporarily required because - # python-libjuju's `Model.deploy()` breaks with this temporary channel format: - await ops_test.juju( - "deploy", + await ops_test.model.deploy( DATA_INTEGRATOR.charm, - "--trust", - "--channel", - "latest/edge/mlflow-client", - "--revision", - "521", + channel=DATA_INTEGRATOR.channel, + config=DATA_INTEGRATOR.config, + trust=DATA_INTEGRATOR.trust, ) - # await ops_test.model.deploy( - # DATA_INTEGRATOR.charm, - # channel=DATA_INTEGRATOR.channel, - # config=DATA_INTEGRATOR.config, - # trust=DATA_INTEGRATOR.trust, - # ) await ops_test.model.wait_for_idle( apps=[DATA_INTEGRATOR.charm], status="blocked", timeout=600, idle_period=60 ) diff --git a/tests/integration/test_charm_s3.py b/tests/integration/test_charm_s3.py index 8bc91868..6d57936a 100644 --- a/tests/integration/test_charm_s3.py +++ b/tests/integration/test_charm_s3.py @@ -393,25 +393,12 @@ async def test_can_connect_exporter_and_get_metrics(self, ops_test: OpsTest): @pytest.mark.abort_on_fail async def test_deploy_data_integrator(self, ops_test: OpsTest): """Deploy a data-integrator instance, for user grants in subsequent tests.""" - # TODO: remove this command and restore the command below once - # https://github.com/canonical/data-integrator/pull/328 lands on main, that is on channel - # "latest/edge", and mind that an explicit Juju-CLI deploy is temporarily required because - # python-libjuju's `Model.deploy()` breaks with this temporary channel format: - await ops_test.juju( - "deploy", + await ops_test.model.deploy( DATA_INTEGRATOR.charm, - "--trust", - "--channel", - "latest/edge/mlflow-client", - "--revision", - "521", + channel=DATA_INTEGRATOR.channel, + config=DATA_INTEGRATOR.config, + trust=DATA_INTEGRATOR.trust, ) - # await ops_test.model.deploy( - # DATA_INTEGRATOR.charm, - # channel=DATA_INTEGRATOR.channel, - # config=DATA_INTEGRATOR.config, - # trust=DATA_INTEGRATOR.trust, - # ) await ops_test.model.wait_for_idle( apps=[DATA_INTEGRATOR.charm], status="blocked", timeout=600, idle_period=60 )