From 17f33712db18f348a3d567e25543a29beb6b87fd Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 13 Mar 2014 20:37:02 +0000 Subject: [PATCH] minor fixes --- tests/helpers/testmixin.py | 2 +- tests/interfaces/openlp_core_ui/test_thememanager.py | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/helpers/testmixin.py b/tests/helpers/testmixin.py index a087bd475..9a8070952 100644 --- a/tests/helpers/testmixin.py +++ b/tests/helpers/testmixin.py @@ -51,4 +51,4 @@ class TestMixin(object): Settings().set_filename(self.ini_file) def destroy_settings(self): - os.unlink(Settings().fileName()) \ No newline at end of file + os.unlink(Settings().fileName()) diff --git a/tests/interfaces/openlp_core_ui/test_thememanager.py b/tests/interfaces/openlp_core_ui/test_thememanager.py index a539d4e44..8f5b52147 100644 --- a/tests/interfaces/openlp_core_ui/test_thememanager.py +++ b/tests/interfaces/openlp_core_ui/test_thememanager.py @@ -31,8 +31,6 @@ Interface tests to test the themeManager class and related methods. """ from unittest import TestCase -from PyQt4 import QtGui, QtCore - from openlp.core.common import Registry, Settings from openlp.core.ui import ThemeManager from tests.functional import patch, MagicMock @@ -49,11 +47,6 @@ class TestThemeManager(TestCase, TestMixin): """ self.build_settings() self.get_application() - old_app_instance = QtCore.QCoreApplication.instance() - if old_app_instance is None: - self.app = QtGui.QApplication([]) - else: - self.app = old_app_instance Registry.create() self.theme_manager = ThemeManager() @@ -72,7 +65,7 @@ class TestThemeManager(TestCase, TestMixin): self.theme_manager.load_first_time_themes = MagicMock() Settings().setValue('themes/global theme', 'my_theme') - # WHEN: the initialistion is run + # WHEN: the initialisation is run self.theme_manager.bootstrap_initialise() # THEN: