~suutari-olli/openlp/escape-fixes-1294111-1497637

« back to all changes in this revision

Viewing changes to tests/functional/openlp_core_ui/test_firsttimeform.py

  • Committer: suutari-olli
  • Date: 2016-01-07 02:53:59 UTC
  • mfrom: (2557.2.31 openlp)
  • Revision ID: suutari.olli@gmail.com-20160107025359-q2feybbwxaoihqxr
Merge to trunk on 1/7/2015.

I noticed this branch also seems to be fixing this bug:
https://bugs.launchpad.net/openlp/+bug/1531691

However, escape item still remains buggy with problems related to resuming
video and presentations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
###############################################################################
5
5
# OpenLP - Open Source Lyrics Projection                                      #
6
6
# --------------------------------------------------------------------------- #
7
 
# Copyright (c) 2008-2015 OpenLP Developers                                   #
 
7
# Copyright (c) 2008-2016 OpenLP Developers                                   #
8
8
# --------------------------------------------------------------------------- #
9
9
# This program is free software; you can redistribute it and/or modify it     #
10
10
# under the terms of the GNU General Public License as published by the Free  #
217
217
            self.assertFalse(first_time_form.web_access, 'There should not be web access with an invalid config file')
218
218
 
219
219
    @patch('openlp.core.ui.firsttimeform.get_web_page')
220
 
    @patch('openlp.core.ui.firsttimeform.QtGui.QMessageBox')
 
220
    @patch('openlp.core.ui.firsttimeform.QtWidgets.QMessageBox')
221
221
    def network_error_test(self, mocked_message_box, mocked_get_web_page):
222
222
        """
223
223
        Test we catch a network error in First Time Wizard - bug 1409627