openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix tests and code

This commit is contained in:
Tim Bentley 2018-12-02 09:03:01 +00:00
parent c24fb0cb59
commit c1a1ac58ba
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/widgets/views.py
View File

@ -194,7 +194,7 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties):
image = self.image_manager.get_image(frame['image'], ImageSource.CommandPlugins)
pixmap = QtGui.QPixmap.fromImage(image)
else:
pixmap = frame['image'].pixmap(80, 80)
pixmap = None # frame['image'].pixmap(80, 80)
else:
image = self.image_manager.get_image(frame['path'], ImageSource.ImagePlugin)
pixmap = QtGui.QPixmap.fromImage(image)

2
tests/interfaces/openlp_core/lib/test_pluginmanager.py
View File

@ -80,7 +80,7 @@ class TestPluginManager(TestCase, TestMixin):
# WHEN: We mock out sys.platform to make it return "darwin" and then find the plugins
old_platform = sys.platform
sys.platform = 'darwin'
plugin_manager.find_plugins()
plugin_manager.initialise_plugins()
sys.platform = old_platform
# THEN: We should find the "Songs", "Bibles", etc in the plugins list

3
tests/openlp_core/projectors/test_projector_db.py
View File

@ -146,9 +146,6 @@ class TestProjectorDB(TestCase, TestMixin):
Registry().set_flag('no_web_server', True)
# Mock classes and methods used by mainwindow.
with patch('openlp.core.ui.mainwindow.SettingsForm'), \
patch('openlp.core.ui.mainwindow.ImageManager'), \
patch('openlp.core.ui.mainwindow.LiveController'), \
patch('openlp.core.ui.mainwindow.PreviewController'), \
patch('openlp.core.ui.mainwindow.OpenLPDockWidget'), \
patch('openlp.core.ui.mainwindow.QtWidgets.QToolBox'), \
patch('openlp.core.ui.mainwindow.QtWidgets.QMainWindow.addDockWidget'), \