lp:~raoul-snyman/openlp/refactor-mock
- Get this branch:
- bzr branch lp:~raoul-snyman/openlp/refactor-mock
Branch merges
- Tim Bentley: Approve
-
Diff: 2835 lines (+558/-549)111 files modifiedtests/functional/__init__.py (+1/-6)
tests/functional/openlp_core_common/test_actions.py (+2/-1)
tests/functional/openlp_core_common/test_applocation.py (+1/-1)
tests/functional/openlp_core_common/test_common.py (+1/-2)
tests/functional/openlp_core_common/test_httputils.py (+1/-1)
tests/functional/openlp_core_common/test_init.py (+2/-1)
tests/functional/openlp_core_common/test_languagemanager.py (+1/-1)
tests/functional/openlp_core_common/test_registry.py (+1/-1)
tests/functional/openlp_core_common/test_registryproperties.py (+1/-2)
tests/functional/openlp_core_common/test_settings.py (+2/-1)
tests/functional/openlp_core_common/test_versionchecker.py (+2/-1)
tests/functional/openlp_core_lib/test_db.py (+1/-1)
tests/functional/openlp_core_lib/test_file_dialog.py (+22/-2)
tests/functional/openlp_core_lib/test_formattingtags.py (+1/-2)
tests/functional/openlp_core_lib/test_htmlbuilder.py (+2/-2)
tests/functional/openlp_core_lib/test_image_manager.py (+3/-2)
tests/functional/openlp_core_lib/test_lib.py (+2/-3)
tests/functional/openlp_core_lib/test_mediamanageritem.py (+1/-1)
tests/functional/openlp_core_lib/test_pluginmanager.py (+1/-1)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+2/-4)
tests/functional/openlp_core_lib/test_projectordb.py (+1/-1)
tests/functional/openlp_core_lib/test_renderer.py (+1/-1)
tests/functional/openlp_core_lib/test_screen.py (+1/-1)
tests/functional/openlp_core_lib/test_serviceitem.py (+3/-3)
tests/functional/openlp_core_lib/test_ui.py (+3/-2)
tests/functional/openlp_core_ui/test_aboutform.py (+1/-1)
tests/functional/openlp_core_ui/test_exceptionform.py (+2/-4)
tests/functional/openlp_core_ui/test_first_time.py (+5/-6)
tests/functional/openlp_core_ui/test_firsttimeform.py (+1/-1)
tests/functional/openlp_core_ui/test_formattingtagsform.py (+1/-2)
tests/functional/openlp_core_ui/test_maindisplay.py (+1/-2)
tests/functional/openlp_core_ui/test_mainwindow.py (+1/-2)
tests/functional/openlp_core_ui/test_media.py (+3/-2)
tests/functional/openlp_core_ui/test_servicemanager.py (+2/-3)
tests/functional/openlp_core_ui/test_settingsform.py (+3/-3)
tests/functional/openlp_core_ui/test_shortcutlistdialog.py (+3/-3)
tests/functional/openlp_core_ui/test_slidecontroller.py (+3/-3)
tests/functional/openlp_core_ui/test_themeform.py (+1/-3)
tests/functional/openlp_core_ui/test_thememanager.py (+2/-4)
tests/functional/openlp_core_ui/test_themetab.py (+1/-1)
tests/functional/openlp_core_ui_lib/test_color_button.py (+1/-1)
tests/functional/openlp_core_ui_lib/test_listpreviewwidget.py (+1/-2)
tests/functional/openlp_core_ui_media/test_mediacontroller.py (+1/-1)
tests/functional/openlp_core_ui_media/test_systemplayer.py (+1/-2)
tests/functional/openlp_core_ui_media/test_vlcplayer.py (+1/-1)
tests/functional/openlp_core_ui_media/test_webkitplayer.py (+1/-1)
tests/functional/openlp_plugins/alerts/test_manager.py (+1/-2)
tests/functional/openlp_plugins/bibles/test_bibleimport.py (+3/-4)
tests/functional/openlp_plugins/bibles/test_bibleserver.py (+2/-1)
tests/functional/openlp_plugins/bibles/test_csvimport.py (+1/-2)
tests/functional/openlp_plugins/bibles/test_lib.py (+2/-1)
tests/functional/openlp_plugins/bibles/test_opensongimport.py (+3/-3)
tests/functional/openlp_plugins/bibles/test_osisimport.py (+1/-2)
tests/functional/openlp_plugins/bibles/test_swordimport.py (+2/-1)
tests/functional/openlp_plugins/bibles/test_wordprojectimport.py (+1/-4)
tests/functional/openlp_plugins/bibles/test_zefaniaimport.py (+1/-2)
tests/functional/openlp_plugins/custom/test_mediaitem.py (+24/-3)
tests/functional/openlp_plugins/images/test_imagetab.py (+4/-4)
tests/functional/openlp_plugins/images/test_lib.py (+1/-1)
tests/functional/openlp_plugins/media/test_mediaitem.py (+6/-8)
tests/functional/openlp_plugins/media/test_mediaplugin.py (+1/-1)
tests/functional/openlp_plugins/presentations/test_impresscontroller.py (+4/-4)
tests/functional/openlp_plugins/presentations/test_mediaitem.py (+2/-1)
tests/functional/openlp_plugins/presentations/test_messagelistener.py (+2/-1)
tests/functional/openlp_plugins/presentations/test_pdfcontroller.py (+4/-2)
tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py (+303/-303)
tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py (+5/-6)
tests/functional/openlp_plugins/presentations/test_presentationcontroller.py (+3/-2)
tests/functional/openlp_plugins/remotes/test_remotetab.py (+2/-2)
tests/functional/openlp_plugins/songs/test_editsongform.py (+2/-1)
tests/functional/openlp_plugins/songs/test_editverseform.py (+5/-7)
tests/functional/openlp_plugins/songs/test_ewimport.py (+1/-3)
tests/functional/openlp_plugins/songs/test_foilpresenterimport.py (+1/-2)
tests/functional/openlp_plugins/songs/test_lib.py (+1/-1)
tests/functional/openlp_plugins/songs/test_lyriximport.py (+1/-5)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+3/-3)
tests/functional/openlp_plugins/songs/test_mediashout.py (+2/-3)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+2/-2)
tests/functional/openlp_plugins/songs/test_openlyricsexport.py (+4/-4)
tests/functional/openlp_plugins/songs/test_openlyricsimport.py (+3/-3)
tests/functional/openlp_plugins/songs/test_openoffice.py (+1/-1)
tests/functional/openlp_plugins/songs/test_opensongimport.py (+2/-2)
tests/functional/openlp_plugins/songs/test_opsproimport.py (+1/-2)
tests/functional/openlp_plugins/songs/test_songbeamerimport.py (+3/-3)
tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+3/-3)
tests/functional/openlp_plugins/songs/test_sundayplusimport.py (+2/-3)
tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py (+1/-3)
tests/functional/openlp_plugins/songs/test_zionworximport.py (+3/-3)
tests/functional/test_init.py (+1/-1)
tests/helpers/songfileimport.py (+2/-3)
tests/interfaces/__init__.py (+3/-6)
tests/interfaces/openlp_core_lib/test_pluginmanager.py (+2/-1)
tests/interfaces/openlp_core_ui/test_filerenamedialog.py (+2/-1)
tests/interfaces/openlp_core_ui/test_mainwindow.py (+2/-2)
tests/interfaces/openlp_core_ui/test_projectoreditform.py (+1/-1)
tests/interfaces/openlp_core_ui/test_projectormanager.py (+2/-3)
tests/interfaces/openlp_core_ui/test_projectorsourceform.py (+4/-7)
tests/interfaces/openlp_core_ui/test_servicemanager.py (+2/-2)
tests/interfaces/openlp_core_ui/test_servicenotedialog.py (+2/-1)
tests/interfaces/openlp_core_ui/test_settings_form.py (+2/-1)
tests/interfaces/openlp_core_ui/test_shortcutlistform.py (+1/-1)
tests/interfaces/openlp_core_ui/test_starttimedialog.py (+2/-1)
tests/interfaces/openlp_core_ui/test_thememanager.py (+2/-1)
tests/interfaces/openlp_core_ui_lib/test_listpreviewwidget.py (+2/-2)
tests/interfaces/openlp_plugins/bibles/test_lib_http.py (+1/-1)
tests/interfaces/openlp_plugins/bibles/test_lib_manager.py (+1/-1)
tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py (+1/-1)
tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+2/-2)
tests/interfaces/openlp_plugins/custom/forms/test_customslideform.py (+2/-1)
tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py (+3/-2)
tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py (+2/-1)
Related source package recipes
Branch information
Recent revisions
- 2731. By Raoul Snyman
-
Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now
- 2730. By Raoul Snyman
-
Fix the author_type import properly
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1950/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1861/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1802/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1528/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/... - 2729. By Raoul Snyman
-
Fix a problem with loading Qt's translation files, bug #1676163
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/fix-translations (revision 2729)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1944/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1855/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1796/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1522/
[SUCCESS] https://ci.openlp. io/job/ Branch... - 2728. By Raoul Snyman
-
Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
... - 2726. By Tim Bentley
-
Will SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
Just removed the SSL code to stop the settings and not start the SSL server full removal will be in 2.8 when we change server infrastructure,
With test this time.lp:~trb143/openlp/removessl26 (revision 2728)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1921/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1832/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Te... - 2725. By Raoul Snyman
-
Fix bug #1666005 and bug #1668994
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/off-by-one (revision 2725)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 1914/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/1825/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1766/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1499/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/1089/
[...
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp
