OpenLP

Merge lp://qastaging/~alisonken1/openlp/2.4-bug-1593883-projector-authentication into lp://qastaging/openlp/2.4

  1. 2.4-bug-1593883-projector-authentication
  2. Merge into 2.4
Proposed by Ken Roberts
Status: Merged
Merged at revision: 2639
Proposed branch: lp://qastaging/~alisonken1/openlp/2.4-bug-1593883-projector-authentication
Merge into: lp://qastaging/openlp/2.4
Diff against target: 1082 lines (+452/-98)
5 files modified
openlp/core/common/__init__.py (+2/-1)
openlp/core/lib/projector/constants.py (+5/-1)
openlp/core/lib/projector/pjlink1.py (+125/-83)
tests/functional/openlp_core_common/test_projector_utilities.py (+3/-4)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+317/-9)
To merge this branch: bzr merge lp://qastaging/~alisonken1/openlp/2.4-bug-1593883-projector-authentication
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tomas Groth Approve
Review via email: mp+297820@code.qastaging.launchpad.net

Commit message

Bugfix 1593882 and 1593883 - projector authorization backport

Description of the change

Bugfix 1593882 and 1593883 - projector authorization backport

- Fix exception when authenticated connection requested and pin is None
- Fix pjlink authentication (use python hash instead of qt hash)
- Fix md5_hash functions
- Fix qmd5_hash functions
- Added tests for bugfixes

--------------------------------
lp:~alisonken1/openlp/2.4-bug-1593883-projector-authentication (revision 2637)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1630/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1541/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1479/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1248/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/838/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/906/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/774/

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :

Given the problems we're seeing in trunk, I'm not too happy about all thw string-format changes... Are you sure they all work? Have they all been triggered/tested?

review: Needs Information
Revision history for this message
Ken Roberts (alisonken1) wrote :

Sorry about the string format changes - forgot I had changed that when I copied the file.

The projector code is pretty well exercised when I run it at church, so I believe I would have seen an issue if the formatting was incorrect.

Still adding tests as I make merge requests.

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

I agree with Tomas about testing the strings out. Even if it's just going through everything with your emulator. Either that or write some tests :-P

Revision history for this message
Ken Roberts (alisonken1) wrote :

I tested the trunk code at church with the Eiki XL200 projector. I just finished testing the 2.4 backport code using the emulator. All of the buttons, both the projector and input source edit wizards, and reviewed the log entries. The only thing I found was a minor issue with port validation (the network port field being empty) that will be included in a later fix.

Revision history for this message
Tomas Groth (tomasgroth) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
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.

Subscribers

People subscribed via source and target branches

to all changes: