Commit f666c71
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.1 file changed
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
341 | 341 | | |
342 | 342 | | |
343 | 343 | | |
| 344 | + | |
344 | 345 | | |
345 | 346 | | |
346 | 347 | | |
| |||
0 commit comments