lp:~tomasgroth/openlp/nose2-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2745

Tim Bentley: Needs Fixing on 2017-05-30

Diff: 205 lines (+34/-14)

8 files modified

openlp/core/ui/lib/pathedit.py (+4/-4)
openlp/plugins/presentations/presentationplugin.py (+1/-1)
openlp/plugins/songs/lib/importers/songshowplus.py (+3/-3)
openlp/plugins/songusage/forms/songusagedetaildialog.py (+1/-1)
tests/functional/openlp_plugins/songs/test_editverseform.py (+7/-1)
tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py (+8/-1)
tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py (+8/-1)
tests/resources/songshowplussongs/a mighty fortress is our god.json (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2745. By Tomas Groth on 2017-05-30

pep8 fixes

2744. By Tomas Groth on 2017-05-30

Fix issue where enable-chord settings was not setup correctly for tests.

2743. By Tomas Groth on 2017-05-30

Fix songshowplus encoding issue.

2742. By Phill on 2017-05-23

Add a custom widget for editing and selecting paths. Implemented in OpenLP, with the exception of the import wizards, as I have other plans for refactoring these!

lp:~phill-ridout/openlp/path_edit (revision 2737)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2009/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1919/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1235/
[SUCCESS] https://ci.openl...

2741. By Gary Talent on 2017-05-22

Add support for importing EasyWorship 6 databases

2740. By Ken Roberts on 2017-05-22

-- Update test data for Class 2 tests
-- Update Projector() db class with new data
-- Update test_projectordb tests
-- Rename PJLink1 class to PJLink
-- Fix/update power on/off tests (Qt error not caught properly during test)
-- Remove skip from projector constants test

--------------------------------
lp:~alisonken1/openlp/pjlink2-c (revision 2739)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2020/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1930/
[SUCCESS] https://ci...

2739. By Ken Roberts on 2017-05-22

-- Add pjlink version 1 old database for testing db upgrade

No code changes at this time.

(resubmit was due to trying to add updated test data before tests were updated)

--------------------------------
lp:~alisonken1/openlp/pjlink2-c-resources (revision 2738)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2019/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1929/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1864/
[SUCCESS] https://ci.openlp.io/job/Branch...

2738. By Phill on 2017-05-22

Fix the depreciated code, and refactor it.

lp:~phill-ridout/openlp/import-depreciations (revision 2736)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2013/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1923/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1859/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1239/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1097/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/226/
[FA...

2737. By Ken Roberts on 2017-05-17

- Added PJLINK_DEFAULT_CODES to pjink1 imports
- Refactor command class checks and methods
- Update PJLink1.get_data for UTF-8
- Added method to clear busy flags and send received data signals
- Added class check on command reply data v. stated projector class compatibility
- Added test for PJLink1.socket_abort
- Added test for PJLink1.poll_loop
- Fix regression in test_projector_process_power_on

--------------------------------
lp:~alisonken1/openlp/pjlink2-b (revision 2735)
[SUCCESS] https...

2736. By Ken Roberts on 2017-05-17

Initial PJLink class 2 updates

- Converted PJLINK_DEFAULT_CODES from a static dictionary to dynamically-built dictionary
- Added _not_implemented method to be able to list future methods while updating
- Added class list to hold future method functionality
- Added class list for UDP commands
- Added test for building PJLINK_DEFAULT_CODES dictionary
- Added test for _not_implemented method
- Removed extraneous TODO

--------------------------------
lp:~alisonken1/openlp/pjlink2-a (revision 27...