Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ def image_builder_fixture(
"virt-type": "virtual-machine",
"cores": "2",
},
log=False,
)

yield image_builder_app_name
Expand All @@ -580,7 +581,8 @@ def image_builder_fixture(
series = dep_ctx.series

any_charm_src_overwrite = {
"any_charm.py": textwrap.dedent(f"""\
"any_charm.py": textwrap.dedent(
f"""\
from any_charm_base import AnyCharmBase

class AnyCharm(AnyCharmBase):
Expand All @@ -593,7 +595,8 @@ def _image_relation_changed(self, event):
# Provide mock image relation data
event.relation.data[self.unit]['id'] = '{openstack_config.test_image_id}'
event.relation.data[self.unit]['tags'] = '{series}, amd64'
"""),
"""
),
}
logging.info(
"Deploying fake image builder via any-charm for image ID %s",
Expand Down Expand Up @@ -919,7 +922,8 @@ def mock_planner_app(juju: jubilant.Juju, planner_token_secret: str) -> Iterator
planner_name = "planner"

any_charm_src_overwrite = {
"any_charm.py": textwrap.dedent(f"""\
"any_charm.py": textwrap.dedent(
f"""\
from any_charm_base import AnyCharmBase

class AnyCharm(AnyCharmBase):
Expand All @@ -933,7 +937,8 @@ def __init__(self, *args, **kwargs):
def _on_planner_relation_changed(self, event):
event.relation.data[self.app]["endpoint"] = "http://mock:8080"
event.relation.data[self.app]["token"] = "{planner_token_secret}"
"""),
"""
),
}

juju.deploy(
Expand Down
1 change: 1 addition & 0 deletions tests/integration/helpers/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ def deploy_github_runner_charm(
base=base,
config=default_config,
constraints=constraints or DEFAULT_RUNNER_CONSTRAINTS,
log=False,
**(deploy_kwargs or {}),
)

Expand Down
Loading