Merge lp:~tomasgroth/openlp/nose2-fixes into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Merged at revision: | 2745 |
Proposed branch: | lp:~tomasgroth/openlp/nose2-fixes |
Merge into: | lp:openlp |
Diff against target: |
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) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/nose2-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Needs Fixing | ||
Review via email: mp+324816@code.launchpad.net |
Description of the change
Fixed songshowplus encoding issue.
Fixed issue where enable-chord settings was not setup correctly for tests.
To post a comment you must log in.
lp:~tomasgroth/openlp/nose2-fixes (revision 2745) /ci.openlp. io/job/ Branch- 01-Pull/ 2041/ /ci.openlp. io/job/ Branch- 02-Functional- Tests/1951/ /ci.openlp. io/job/ Branch- 03-Interface- Tests/1880/ /ci.openlp. io/job/ Branch- 04a-Code_ Analysis/ 1260/ /ci.openlp. io/job/ Branch- 04b-Test_ Coverage/ 1110/ /ci.openlp. io/job/ Branch- 04c-Code_ Analysis2/ 239/ /ci.openlp. io/job/ Branch- 05-AppVeyor- Tests/85/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[FAILURE] https:/