Merge lp:~raoul-snyman/openlp/dont-test-uno-on-macos into lp:openlp
Status: | Merged |
---|---|
Merged at revision: | 2792 |
Proposed branch: | lp:~raoul-snyman/openlp/dont-test-uno-on-macos |
Merge into: | lp:openlp |
Diff against target: |
120 lines (+27/-12) 3 files modified
scripts/jenkins_script.py (+16/-6) tests/functional/openlp_core/common/test_i18n.py (+3/-0) tests/functional/openlp_plugins/songs/test_openoffice.py (+8/-6) |
To merge this branch: | bzr merge lp:~raoul-snyman/openlp/dont-test-uno-on-macos |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Review via email: mp+334625@code.launchpad.net |
Description of the change
Fix up and skip some of the tests that don't run on macOS, and add a new parameter to the Jenkins script to continue despite failure.
Add this to your merge proposal:
-------
lp:~raoul-snyman/openlp/dont-test-uno-on-macos (revision 2797)
https:/
https:/
https:/
https:/
https:/
https:/
https:/
https:/
Failed builds:
- Branch-