lp:~trb143/openlp/fixwebabend

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2793

Phill: Approve on 2017-12-02

Raoul Snyman: Approve on 2017-12-02

Diff: 150 lines (+52/-19)

6 files modified

openlp/core/api/http/server.py (+8/-7)
openlp/core/api/websockets.py (+7/-6)
openlp/core/ui/mainwindow.py (+2/-3)
tests/functional/openlp_core/api/http/test_http.py (+17/-1)
tests/functional/openlp_core/api/test_websockets.py (+17/-1)
tests/functional/openlp_core/ui/test_mainwindow.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1735766: Launching Openlp with -w results in a traceback

High

Fix Committed

Link a bug report

Related blueprints

2796. By Tim Bentley on 2017-12-02

missed test name

2795. By Tim Bentley on 2017-12-02

fix tests

2794. By Tim Bentley on 2017-12-02

fix tests

2793. By Tim Bentley on 2017-12-02

fix abend

2792. By Raoul Snyman on 2017-12-02

Fix up and skip some of the tests that don't run on macOS, and add a new parameter to the Jenkins script to continue despite failure.

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/dont-test-uno-on-macos (revision 2797)
https://ci.openlp.io/job/Branch-01-Pull/2325/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2226/ [SUCCESS]
https://ci.openlp.io/jo...

2791. By Ken Roberts on 2017-11-24

- 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/2311/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2212/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-T...

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...