lp:~alisonken1/openlp/bug-1734275

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2791

Tim Bentley: Pending requested 2017-11-24

Phill: Pending requested 2017-11-24

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1734275: Non-standard PJLink reply to LAMP command

High

Fix Committed

Link a bug report

Related blueprints

2792. By Ken Roberts on 2017-11-24

Refactor mocks

2791. By Ken Roberts on 2017-11-24

Bugfix 1734275 Nonstandard LAMP reply

2790. By Phill on 2017-11-22

More pathlib refactors

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/pathlib10 (revision 2796)
https://ci.openlp.io/job/Branch-01-Pull/2307/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2208/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2084/ [WAITING]
[RUNNING]
[SUCCESS]
https:...

2789. By Ken Roberts on 2017-11-18

- Move openlp.core.lib.projector to openlp.core.projectors
- Move openlp.core.ui.projector to openlp.core.projectors
- Move tests.functional.openlp_core/lib/test_projector* to tests.functional.openlp.core.projectors
- Fix imports for new projector location
- Convert projector imports to fully-qualified import
- Fix delete projector item in ui.manager
- Fix projector tests
- Merge trunk (fix tests)
- Rename "Projector" dock to "Projector Controller"
--------------------------------------------...

2788. By Phill on 2017-11-16

Various fixes

lp:~phill-ridout/openlp/fixes-mkIII (revision 2794)
https://ci.openlp.io/job/Branch-01-Pull/2301/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2202/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2080/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1406/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/B...

2787. By Raoul Snyman on 2017-11-16

Add multi-to-one settings upgrading, and merge all the post-2.4 settings changes into __setting_upgrade_2__

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/settings-upgrade (revision 2791)
https://ci.openlp.io/job/Branch-01-Pull/2295/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2196/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2074...

2786. By Phill on 2017-11-16

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/pathlib9 (revision 2783)
https://ci.openlp.io/job/Branch-01-Pull/2286/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2187/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2068/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch...

2785. By Tim Bentley on 2017-11-11

fix a couple of small issues

lp:~trb143/openlp/refactorfixes (revision 2787)
https://ci.openlp.io/job/Branch-01-Pull/2278/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2180/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2061/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1391/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1216/ [SUCCESS]
https://ci.ope...

2784. By Phill on 2017-11-11

Fixed a number of bugs, and tests.

Failing on Code Analysis2, but this looks like fallout from the refactors (it hasn't passed since the beginning of october)

Also contains superflys branch lp:~raoul-snyman/openlp/fix-linting

--------------------------------
lp:~phill-ridout/openlp/fixes-mkII (revision 2794)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2276/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2178/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests...

2783. By Raoul Snyman on 2017-11-10

Change the Jenkins script to use the official Jenkins Python API module (python3-jenkins in Debian/Ubuntu and Fedora). Also updated the display a bit and added some helpful messaging. This script now uses your username and your password (or personal token) for authentication instead of a a shared token.

$ python3 scripts/jenkins_script.py -h
usage: jenkins_script.py [-h] [-d] [-b] [-n] -u USERNAME -p PASSWORD

optional arguments:
 ...