Merge lp://qastaging/~alisonken1/openlp/bug-1734275 into lp://qastaging/openlp

Proposed by Ken Roberts
Status: Merged
Merged at revision: 2791
Proposed branch: lp://qastaging/~alisonken1/openlp/bug-1734275
Merge into: lp://qastaging/openlp
Diff against target: 312 lines (+156/-98)
5 files modified
openlp/core/projectors/manager.py (+7/-5)
openlp/core/projectors/pjlink.py (+14/-11)
tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py (+134/-0)
tests/functional/openlp_core/projectors/test_projector_pjlink_base.py (+1/-53)
tests/functional/openlp_core/projectors/test_projector_pjlink_commands.py (+0/-29)
To merge this branch: bzr merge lp://qastaging/~alisonken1/openlp/bug-1734275
Reviewer Review Type Date Requested Status
Tim Bentley Pending
Phill Pending
Review via email: mp+334265@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-11-24.

Commit message

Bugfix 1734275 - PJLink non-standard response to LAMP command

Description of the change

- Fix non-standard LAMP response (bug 1734275)
- Moved bugfix tests to separate file
- Added test for non-standard LAMP response
- Refactor mocks
- Cleanups

--------------------------------------------------------------------------------
lp:~alisonken1/openlp/bug-1734275 (revision 2792)
https://ci.openlp.io/job/Branch-01-Pull/2312/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2213/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2089/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1415/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1237/ [SUCCESS]
https://ci.openlp.io/job/Branch-04c-Code_Analysis2/367/ [SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/198/ [FAILURE]

To post a comment you must log in.
Revision history for this message
Phill (phill-ridout) wrote : Posted in a previous version of this proposal

A few inline comments, nothing major Sorry if it seems like I be tripping on my new status! :-p

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Phill (phill-ridout) wrote : Posted in a previous version of this proposal

You've just missed removing the pjlink instance in the test file. (see inline)

Revision history for this message
Phill (phill-ridout) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Phill (phill-ridout) : Posted in a previous version of this proposal
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.