← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/interfaces/openlp_core_lib/test_pluginmanager.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:
tests/interfaces/openlp_core_lib/test_pluginmanager.py
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  #
28
28
from tempfile import mkdtemp
29
29
from unittest import TestCase
30
30
 
31
 
from PyQt4 import QtGui
 
31
from PyQt5 import QtWidgets
32
32
 
33
33
from openlp.core.common import Registry, Settings
34
34
from openlp.core.lib.pluginmanager import PluginManager
52
52
        Registry.create()
53
53
        Registry().register('service_list', MagicMock())
54
54
        self.setup_application()
55
 
        self.main_window = QtGui.QMainWindow()
 
55
        self.main_window = QtWidgets.QMainWindow()
56
56
        Registry().register('main_window', self.main_window)
57
57
 
58
58
    def tearDown(self):