diff --git a/openlp/core/utils/__init__.py b/openlp/core/lib/webpagereader.py similarity index 100% rename from openlp/core/utils/__init__.py rename to openlp/core/lib/webpagereader.py diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index 0d7c129bf..f2be3b29c 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -39,7 +39,7 @@ from openlp.core.common import Registry, RegistryProperties, AppLocation, Settin translate, clean_button_text, trace_error_handler from openlp.core.lib import PluginStatus, build_icon from openlp.core.lib.ui import critical_error_message_box -from openlp.core.utils import get_web_page, CONNECTION_RETRIES, CONNECTION_TIMEOUT +from openlp.core.lib.webpagereader import get_web_page, CONNECTION_RETRIES, CONNECTION_TIMEOUT from .firsttimewizard import UiFirstTimeWizard, FirstTimePage log = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index ba7d13e27..78f2692b1 100755 --- a/setup.py +++ b/setup.py @@ -65,8 +65,8 @@ def natural_sort(seq): return temp -# NOTE: The following code is a duplicate of the code in openlp/core/utils/__init__.py. Any fix applied here should also -# be applied there. +# NOTE: The following code is a duplicate of the code in openlp/core/common/checkversion.py. +# Any fix applied here should also be applied there. ver_file = None try: # Get the revision of this tree. diff --git a/tests/functional/openlp_core_ui/test_first_time.py b/tests/functional/openlp_core_ui/test_first_time.py new file mode 100644 index 000000000..b9a7622a2 --- /dev/null +++ b/tests/functional/openlp_core_ui/test_first_time.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2016 OpenLP Developers # +# --------------------------------------------------------------------------- # +# 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.__init__ package. +""" + +from unittest import TestCase +import urllib.request +import urllib.error +import urllib.parse + +from tests.functional import MagicMock, patch +from tests.helpers.testmixin import TestMixin + +from openlp.core.utils import CONNECTION_TIMEOUT, CONNECTION_RETRIES, get_web_page + + +class TestFirstTimeWizard(TestMixin, TestCase): + """ + Test First Time Wizard import functions + """ + def webpage_connection_retry_test(self): + """ + Test get_web_page will attempt CONNECTION_RETRIES+1 connections - bug 1409031 + """ + # GIVEN: Initial settings and mocks + with patch.object(urllib.request, 'urlopen') as mocked_urlopen: + mocked_urlopen.side_effect = ConnectionError + + # WHEN: A webpage is requested + try: + get_web_page(url='http://localhost') + except: + pass + + # THEN: urlopen should have been called CONNECTION_RETRIES + 1 count + self.assertEquals(mocked_urlopen.call_count, CONNECTION_RETRIES + 1, + 'get_web_page() should have tried {} times'.format(CONNECTION_RETRIES))