Merge lp://qastaging/~raoul-snyman/openlp/bug-1608194-2.4 into lp://qastaging/openlp/2.4
Status: | Merged |
---|---|
Merged at revision: | 2648 |
Proposed branch: | lp://qastaging/~raoul-snyman/openlp/bug-1608194-2.4 |
Merge into: | lp://qastaging/openlp/2.4 |
Diff against target: |
394 lines (+115/-62) 4 files modified
openlp/plugins/songs/lib/__init__.py (+2/-3) openlp/plugins/songs/lib/db.py (+2/-2) openlp/plugins/songs/lib/songselect.py (+72/-36) tests/functional/openlp_plugins/songs/test_songselect.py (+39/-21) |
To merge this branch: | bzr merge lp://qastaging/~raoul-snyman/openlp/bug-1608194-2.4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Review via email:
|
This proposal supersedes a proposal from 2016-08-11.
Description of the change
Fix SongSelect.
Do updated tests count?
Add this to your merge proposal:
-------
lp:~raoul-snyman/openlp/bug-1608194-2.4 (revision 2650)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
Update tests count.
You wrote the rules, I am just imposing them!