openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/bug-1409031 into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
Related bugs:
  Bug #1409031 in OpenLP: "FTW hangs on "Downloading Resource Index" page"
  https://bugs.launchpad.net/openlp/+bug/1409031

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/bug-1409031/+merge/246002

Fix retry counter when fetching a webpage - bug 1409031
Fix line spacing

lp:~alisonken1/openlp/bug-1409031 (revision 2471)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/855/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/787/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/733/
[FAILURE] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/637/
Stopping after failure

passed local nosetest
passed local pep8

-- 
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2015-01-02 11:58:44 +0000
+++ openlp/core/utils/__init__.py	2015-01-09 19:03:11 +0000
@@ -401,7 +401,7 @@
         req.add_header(header[0], header[1])
     page = None
     log.debug('Downloading URL = %s' % url)
-    retries = 0
+    retries = 1
     while True:
         try:
             page = urllib.request.urlopen(req, timeout=CONNECTION_TIMEOUT)
@@ -411,6 +411,7 @@
                 log.exception('The web page could not be downloaded')
                 raise
             else:
+                retries += 1
                 time.sleep(0.1)
                 continue
         break

=== added file 'tests/functional/openlp_core_utils/test_first_time.py'
--- tests/functional/openlp_core_utils/test_first_time.py	1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_core_utils/test_first_time.py	2015-01-09 19:03:11 +0000
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2015 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2015 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.__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))