diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index d0eed649c..096b4e1dd 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -116,8 +116,8 @@ class VersionThread(QtCore.QThread): app_version = get_application_version() version = check_latest_version(app_version) log.debug("Versions %s and %s " % (LooseVersion(str(version)), LooseVersion(str(app_version['full'])))) - #if LooseVersion(str(version)) > LooseVersion(str(app_version['full'])): - self.main_window.emit(QtCore.SIGNAL('openlp_version_check'), '%s' % version) + if LooseVersion(str(version)) > LooseVersion(str(app_version['full'])): + self.main_window.emit(QtCore.SIGNAL('openlp_version_check'), '%s' % version) class HTTPRedirectHandlerFixed(urllib.request.HTTPRedirectHandler): @@ -227,8 +227,6 @@ def check_latest_version(current_version): this_test = str(datetime.now().date()) settings.setValue('last version test', this_test) settings.endGroup() - # Tell the main window whether there will ever be data to display - Registry().get('main_window').version_update_running = last_test != this_test if last_test != this_test: if current_version['build']: req = urllib.request.Request('http://www.openlp.org/files/nightly_version.txt') diff --git a/tests/functional/openlp_core_utils/test_init.py b/tests/functional/openlp_core_utils/test_init.py new file mode 100644 index 000000000..0931014ab --- /dev/null +++ b/tests/functional/openlp_core_utils/test_init.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2014 Raoul Snyman # +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # +# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # +# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # +# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # +# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # +# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### +""" +Package to test the openlp.core.utils.actions package. +""" +from unittest import TestCase + +from openlp.core.common.settings import Settings +from openlp.core.utils import VersionThread, get_application_version +from tests.functional import MagicMock, patch +from tests.helpers.testmixin import TestMixin + + +class TestInitFunctions(TestMixin, TestCase): + + def setUp(self): + """ + Create an instance and a few example actions. + """ + self.build_settings() + + def tearDown(self): + """ + Clean up + """ + self.destroy_settings() + + def version_thread_triggered_test(self): + """ + Test the version thread call does not trigger UI + :return: + """ + # GIVEN: a equal version setup and the data is not today. + mocked_main_window = MagicMock() + Settings().setValue('core/last version test', '1950-04-01') + # WHEN: We check to see if the version is different . + with patch('PyQt4.QtCore.QThread'),\ + patch('openlp.core.utils.get_application_version') as mocked_get_application_version: + mocked_get_application_version.return_value = \ + {'version': '1.0.0', 'build': '', 'full': '2.0.4'} + version_thread = VersionThread(mocked_main_window) + version_thread.run() + # THEN: If the version has changed the main window is notified + self.assertTrue(mocked_main_window.emit.called, 'The main windows should have been notified')