lp://qastaging/~trb143/openlp/asserts

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp at revision 2799

Phill: Approve on 2017-12-22

Diff: 2511 lines (+489/-499)

27 files modified

openlp/core/lib/__init__.py (+0/-1)
openlp/core/lib/mediamanageritem.py (+1/-2)
tests/functional/openlp_core/test_app.py (+12/-12)
tests/functional/openlp_core/ui/media/test_mediacontroller.py (+10/-10)
tests/functional/openlp_core/ui/media/test_systemplayer.py (+27/-28)
tests/functional/openlp_core/ui/media/test_vlcplayer.py (+50/-52)
tests/functional/openlp_core/ui/media/test_webkitplayer.py (+2/-4)
tests/functional/openlp_core/ui/test_aboutform.py (+3/-4)
tests/functional/openlp_core/ui/test_advancedtab.py (+4/-4)
tests/functional/openlp_core/ui/test_firsttimeform.py (+12/-12)
tests/functional/openlp_core/ui/test_formattingtagscontroller.py (+8/-12)
tests/functional/openlp_core/ui/test_formattingtagsform.py (+2/-2)
tests/functional/openlp_core/ui/test_maindisplay.py (+24/-24)
tests/functional/openlp_core/ui/test_mainwindow.py (+4/-4)
tests/functional/openlp_core/ui/test_media.py (+22/-22)
tests/functional/openlp_core/ui/test_servicemanager.py (+152/-153)
tests/functional/openlp_core/ui/test_settingsform.py (+5/-5)
tests/functional/openlp_core/ui/test_slidecontroller.py (+58/-54)
tests/functional/openlp_core/ui/test_themeform.py (+1/-1)
tests/functional/openlp_core/ui/test_thememanager.py (+6/-6)
tests/functional/openlp_core/ui/test_themetab.py (+3/-3)
tests/functional/openlp_core/widgets/test_buttons.py (+11/-12)
tests/functional/openlp_core/widgets/test_dialogs.py (+12/-12)
tests/functional/openlp_core/widgets/test_edits.py (+13/-13)
tests/functional/openlp_core/widgets/test_views.py (+32/-32)
tests/functional/openlp_plugins/songs/test_ewimport.py (+6/-6)
tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py (+9/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2826. By Tim Bentley on 2017-12-22

Fix tests and make pytest run clean

2825. By Tim Bentley on 2017-12-20

more ui bits

2824. By Tim Bentley on 2017-12-20

more ui bits

2823. By Tim Bentley on 2017-12-20

start ui 2

2822. By Tim Bentley on 2017-12-20

start ui

2821. By Tim Bentley on 2017-12-20

pep8

2820. By Tim Bentley on 2017-12-20

ui media done

2819. By Tim Bentley on 2017-12-20

Start media

2818. By Tim Bentley on 2017-12-19

fix up widgets

2817. By Tim Bentley on 2017-12-19

buttons and app