Merge lp://qastaging/~raoul-snyman/openlp/refactor-mock into lp://qastaging/openlp
Proposed by
Raoul Snyman
| Status: | Merged |
|---|---|
| Merged at revision: | 2733 |
| Proposed branch: | lp://qastaging/~raoul-snyman/openlp/refactor-mock |
| Merge into: | lp://qastaging/openlp |
| Diff against target: |
2835 lines (+558/-549) 111 files modified
tests/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) |
| To merge this branch: | bzr merge lp://qastaging/~raoul-snyman/openlp/refactor-mock |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Bentley | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2017-04-27.
Commit message
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.
Description of the change
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.
Windows tests are failing due to file sharing (we've had this issue before), unrelated to my changes.
Add this to your merge proposal:
-------
lp:~raoul-snyman/openlp/refactor-mock (revision 2734)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[FAILURE] https:/
To post a comment you must log in.
Revision history for this message
| Raoul Snyman (raoul-snyman) wrote | # |
Revision history for this message
| Tim Bentley (trb143) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Should we not remove the code from tests.functional and run the tests to prove a complete removal?