lp:~alisonken1/openlp/pjlink2-o

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2809

Raoul Snyman: Approve on 2018-01-14

Tim Bentley: Approve on 2018-01-13

Diff: 3315 lines (+933/-1031)

10 files modified

openlp/core/projectors/db.py (+4/-1)
openlp/core/projectors/manager.py (+4/-26)
openlp/core/projectors/pjlink.py (+155/-233)
openlp/core/projectors/upgrade.py (+21/-1)
tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py (+22/-54)
tests/functional/openlp_core/projectors/test_projector_db.py (+36/-42)
tests/functional/openlp_core/projectors/test_projector_pjlink_base.py (+461/-75)
tests/functional/openlp_core/projectors/test_projector_pjlink_cmd_routing.py (+25/-32)
tests/functional/openlp_core/projectors/test_projector_pjlink_commands_01.py (+112/-514)
tests/functional/openlp_core/projectors/test_projector_pjlink_commands_02.py (+93/-53)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2809. By Ken Roberts on 2018-01-13

Update pjlink_class define in db

2808. By Ken Roberts on 2018-01-13

PJLink2 update o

2807. By Raoul Snyman on 2018-01-07

Major overhaul of how threading in OpenLP works. Rather than messing around with threads yourself, you create a worker object descended from ThreadWorker, implement start() (and stop() if it's a long-running thread), and run it using run_thread().

Changes related to thread API:

- WebSocket was refactored (mostly into the worker)
- HttpServer was refactored a bit
- CheckMediaWorker was refactored a bit
- Version check refactored
- SongSelect search refactored
- New _wait_for_threads() method...

2806. By Ken Roberts on 2018-01-03

--------------------------------------------------------------------------------
lp:~alisonken1/openlp/pjlink2-n (revision 2806)
https://ci.openlp.io/job/Branch-01-Pull/2409/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2310/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/105/ [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/29/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-ma...

2805. By Simon Hanna on 2018-01-02

Fixed the version checking to be more robust

* Strip the response so empty responses that contain whitespace are in fact empty
* Change http to https to result in one less query
* Add test for responses containing white space
* Add .cache to bzrignore (generated by pytest when tests fail)

2804. By Tim Bentley on 2018-01-01

Update the year to 2018
Add some missing copyright files
Reorder and fix the imports for all files.
Fix a timing issue with the mac build which makes it fail all the time.

lp:~trb143/openlp/textcleanups (revision 2812)
https://ci.openlp.io/job/Branch-01-Pull/2406/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2307/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/102/ [SUCCESS]
https://ci.openlp.io/job/Branch-03...

2803. By Phill on 2017-12-24

Move song test resources

lp:~phill-ridout/openlp/moar_test_cleanups (revision 2809)
https://ci.openlp.io/job/Branch-01-Pull/2390/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2291/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/86/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/11/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Bra...

2802. By Phill on 2017-12-24

Some more pathlib refactors.
Test tidy ups

lp:~phill-ridout/openlp/pathlib11 (revision 2806)
https://ci.openlp.io/job/Branch-01-Pull/2384/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2285/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/80/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/5/ [WAITING]
[SUCCESS]
https://ci.openlp.i...

2801. By Tim Bentley on 2017-12-24

All tests migrated to assert from self.assert except projection
All tests pass on linux with pytest and nose2

lp:~trb143/openlp/asserts2 (revision 2839)
https://ci.openlp.io/job/Branch-01-Pull/2381/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2282/ [SUCCESS]
  File "./scripts/jenkins_script.py", line 256, in <module>
    main()
  File "./scripts/jenkins_script.py", line 252, in main
    jenkins_trigger.print_output(can_continue=args.alw...

2800. By Raoul Snyman on 2017-12-23

As part of an ongoing effort to improve our tests, I'd like to re-arrange our branch tests the way I re-arranged the trunk tests. This updates the script, and once it is merged, I'll update Jenkins to match and send a mail to the list to alert everyone.