raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix failing test due to name conflict

This commit is contained in:
Simon Hanna 2016-01-09 01:15:23 +01:00
parent 21c6a3ff1c
commit bf4225838e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/functional/openlp_plugins/media/test_mediaplugin.py
View File

@ -40,7 +40,7 @@ class MediaPluginTest(TestCase, TestMixin):
@patch(u'openlp.plugins.media.mediaplugin.Plugin.initialise')
@patch(u'openlp.plugins.media.mediaplugin.Settings')
def initialise_test(self, mocked_settings, mocked_initialise):
def initialise_test(self, _mocked_settings, mocked_initialise):
"""
Test that the initialise() method overwrites the built-in one, but still calls it
"""
@ -48,7 +48,7 @@ class MediaPluginTest(TestCase, TestMixin):
media_plugin = MediaPlugin()
mocked_settings = MagicMock()
mocked_settings.get_files_from_config.return_value = True # Not the real value, just need something "true-ish"
mocked_settings.return_value = mocked_settings
_mocked_settings.return_value = mocked_settings
# WHEN: initialise() is called
media_plugin.initialise()