Skip to content

Commit f666c71

Browse files
authored
Merge pull request #856 from cderici/fix-ci-integration-test
#856 #### Description Looks like we accidentally took out a useful decorator in 5b55b35 The `base.bootstrapped` allows to test to skip (instead of failing) if there's no bootstrapped juju in the environment (which we don't in the merge jobs in jenkins). #### QA Steps All CI tests need to pass. The `github-check-merge-juju-python-libjuju` job fails without this, so that job should be passing. #### Notes & Discussion #853 should rebase on `master` after this lands.
2 parents 2b8c252 + 5c2d310 commit f666c71

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

tests/integration/test_model.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ async def test_deploy_from_ch_channel_revision_success(event_loop):
341341
await model.deploy("postgresql", application_name="test2", channel='latest/stable', revision=290)
342342

343343

344+
@base.bootstrapped
344345
@pytest.mark.asyncio
345346
async def test_deploy_trusted_bundle(event_loop):
346347
async with base.CleanModel() as model:

0 commit comments

Comments
 (0)