From a44d70cb0f4c1668cd9d4e83c36782d3bc9ad633 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Fri, 8 Jan 2016 22:44:22 +0100 Subject: [PATCH] Fix some tests on windows. --- openlp/core/ui/themeform.py | 2 +- tests/helpers/testmixin.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 3a652cebc..cd81ec800 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -159,7 +159,7 @@ class ThemeForm(QtWidgets.QWizard, Ui_ThemeWizard, RegistryProperties): if not event: event = QtGui.QResizeEvent(self.size(), self.size()) QtWidgets.QWizard.resizeEvent(self, event) - if self.currentPage() == self.preview_page: + if hasattr(self, 'preview_page') and self.currentPage() == self.preview_page: frame_width = self.preview_box_label.lineWidth() pixmap_width = self.preview_area.width() - 2 * frame_width pixmap_height = self.preview_area.height() - 2 * frame_width diff --git a/tests/helpers/testmixin.py b/tests/helpers/testmixin.py index e3f7a83b7..3e933cb39 100644 --- a/tests/helpers/testmixin.py +++ b/tests/helpers/testmixin.py @@ -48,13 +48,17 @@ class TestMixin(object): """ Build the settings Object and initialise it """ - Settings.setDefaultFormat(Settings.IniFormat) self.fd, self.ini_file = mkstemp('.ini') - Settings().set_filename(self.ini_file) + Settings.set_filename(self.ini_file) + Settings().setDefaultFormat(Settings.IniFormat) + # Needed on windows to make sure a Settings object is available during the tests + self.setting = Settings() + Settings().setValue('themes/global theme', 'my_theme') def destroy_settings(self): """ Destroy the Settings Object """ + del self.setting os.close(self.fd) os.unlink(Settings().fileName())