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

Removed a log line I never wrote and move a variable for a test I need it in

Browse Source
This commit is contained in:
Raoul Snyman 2016-08-12 12:24:54 +02:00
parent 0fc598fab5
commit c9ff88ebfc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/projector/sourceselectform.py
View File

@ -20,9 +20,9 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
""" """
:mod: `openlp.core.ui.projector.sourceselectform` module :mod: `openlp.core.ui.projector.sourceselectform` module
Provides the dialog window for selecting video source for projector. Provides the dialog window for selecting video source for projector.
""" """
import logging import logging
@ -34,7 +34,6 @@ from openlp.core.lib.projector.db import ProjectorSource
from openlp.core.lib.projector.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES from openlp.core.lib.projector.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
log.debug('editform loaded')
def source_group(inputs, source_text): def source_group(inputs, source_text):
@ -270,7 +269,6 @@ class SourceSelectTabs(QtWidgets.QDialog):
self.projector = projector self.projector = projector
self.source_text = self.projectordb.get_source_list(projector=projector) self.source_text = self.projectordb.get_source_list(projector=projector)
self.source_group = source_group(projector.source_available, self.source_text) self.source_group = source_group(projector.source_available, self.source_text)
# self.source_group = {'4': {'41': 'Storage 1'}, '5': {"51": 'Network 1'}}
self.button_group = [] if self.edit else QtWidgets.QButtonGroup() self.button_group = [] if self.edit else QtWidgets.QButtonGroup()
keys = list(self.source_group.keys()) keys = list(self.source_group.keys())
keys.sort() keys.sort()

5
tests/functional/openlp_core_common/test_registryproperties.py
View File

@ -37,7 +37,7 @@ class TestRegistryProperties(TestCase, RegistryProperties):
""" """
Create the Register Create the Register
""" """
self.registry = Registry.create() Registry.create()
def test_no_application(self): def test_no_application(self):
""" """
@ -85,9 +85,10 @@ class TestRegistryProperties(TestCase, RegistryProperties):
mocked_is_win.return_value = True mocked_is_win.return_value = True
mock_application = MagicMock() mock_application = MagicMock()
reg_props = RegistryProperties() reg_props = RegistryProperties()
registry = Registry()
# WHEN the application is accessed # WHEN the application is accessed
with patch.object(self.registry, 'get') as mocked_get: with patch.object(registry, 'get') as mocked_get:
mocked_get.return_value = mock_application mocked_get.return_value = mock_application
actual_application = reg_props.application actual_application = reg_props.application