Merge lp://qastaging/~raoul-snyman/openlp/pyro4-maclo into lp://qastaging/openlp

Proposed by Raoul Snyman
Status: Merged
Merged at revision: 2902
Proposed branch: lp://qastaging/~raoul-snyman/openlp/pyro4-maclo
Merge into: lp://qastaging/openlp
Diff against target: 108 lines (+33/-9)
4 files modified
openlp/.version (+1/-1)
openlp/plugins/presentations/lib/maclocontroller.py (+13/-7)
tests/functional/openlp_plugins/presentations/test_libreofficeserver.py (+10/-0)
tests/functional/openlp_plugins/presentations/test_maclocontroller.py (+9/-1)
To merge this branch: bzr merge lp://qastaging/~raoul-snyman/openlp/pyro4-maclo
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+372748@code.qastaging.launchpad.net

Commit message

Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well

Description of the change

Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

JavaScript tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

macOS tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.