OpenLP

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

  1. bug-1550891
  2. Merge into trunk
Proposed by Ken Roberts
Status: Merged
Approved by: Tim Bentley
Approved revision: 2624
Merged at revision: 2624
Proposed branch: lp://qastaging/~alisonken1/openlp/bug-1550891
Merge into: lp://qastaging/openlp
Diff against target: 51 lines (+24/-2)
2 files modified
openlp/core/lib/projector/pjlink1.py (+10/-2)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+14/-0)
To merge this branch: bzr merge lp://qastaging/~alisonken1/openlp/bug-1550891
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Review via email: mp+287407@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-02-28.

Commit message

Fix Projector Manager receiving non-PJLink reply to initial class query and encoding exception when sending data

Description of the change

- Fix projector manager receiving an invalid class response on initial connection
- Fix string encoding to ascii when sending request to projector

--------------------------------
lp:~alisonken1/openlp/bug-1550891 (revision 2624)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1301/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1223/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1162/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/997/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/588/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/654/
[FAILURE] https://ci.openlp.io/job/Branch-05b-Test_Coverage/523/
Stopping after failure

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
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.