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

Fix some issues from the mergefest 

bzr-revno: 2779
This commit is contained in:
Raoul Snyman 2017-10-09 19:40:41 -07:00
parent 19040ebb5d
commit 4d68382d52
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/upgrade.py
View File

@ -29,7 +29,7 @@ import logging
from sqlalchemy import Table, Column, ForeignKey, types from sqlalchemy import Table, Column, ForeignKey, types
from sqlalchemy.sql.expression import func, false, null, text from sqlalchemy.sql.expression import func, false, null, text
from openlp.core.common import AppLocation from openlp.core.common.applocation import AppLocation
from openlp.core.common.db import drop_columns from openlp.core.common.db import drop_columns
from openlp.core.common.json import OpenLPJsonEncoder from openlp.core.common.json import OpenLPJsonEncoder
from openlp.core.common.path import Path from openlp.core.common.path import Path

2
tests/functional/openlp_core_ui/test_style.py
View File

@ -33,7 +33,7 @@ from openlp.core.ui.style import MEDIA_MANAGER_STYLE, WIN_REPAIR_STYLESHEET, get
@skipIf(not hasattr(openlp.core.ui.style, 'qdarkstyle'), 'qdarkstyle is not installed') @skipIf(not hasattr(openlp.core.ui.style, 'qdarkstyle'), 'qdarkstyle is not installed')
@patch('openlp.core.ui.style.HAS_DARK_STYLE', True) @patch('openlp.core.ui.style.HAS_DARK_STYLE', True)
@patch('openlp.core.ui.style.Settings') @patch('openlp.core.ui.style.Settings')
@patch('object(openlp.core.ui.style.qdarkstyle') @patch('openlp.core.ui.style.qdarkstyle')
def test_get_application_stylesheet_dark(mocked_qdarkstyle, MockSettings): def test_get_application_stylesheet_dark(mocked_qdarkstyle, MockSettings):
"""Test that the dark stylesheet is returned when available and enabled""" """Test that the dark stylesheet is returned when available and enabled"""
# GIVEN: We're on Windows and no dark style is set # GIVEN: We're on Windows and no dark style is set