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:
  OpenLP Core (openlp-core)
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/245991

Fix retry counter when fetching a webpage - bug 1409031

lp:~alisonken1/openlp/bug-1409031 (revision 2470)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/847/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/779/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/725/
[FAILURE] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/629/
Stopping after failure

passed local nosetest
passed local pep8

-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/bug-1409031 into 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 17:57:07 +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

=== modified file 'tests/functional/openlp_core_utils/test_init.py'
--- tests/functional/openlp_core_utils/test_init.py	2015-01-02 11:40:51 +0000
+++ tests/functional/openlp_core_utils/test_init.py	2015-01-09 17:57:07 +0000
@@ -83,7 +83,7 @@
 
             # THEN: The command 'libreoffice' should be called with the appropriate parameters
             self.assertEquals(result, 'libreoffice --nologo --norestore --minimized --nodefault --nofirststartwizard'
-                                       ' "--accept=pipe,name=openlp_pipe;urp;"')
+                                      ' "--accept=pipe,name=openlp_pipe;urp;"')
 
     def get_uno_command_only_soffice_command_exists_test(self):
         """
@@ -101,7 +101,7 @@
 
             # THEN: The command 'soffice' should be called with the appropriate parameters
             self.assertEquals(result, 'soffice --nologo --norestore --minimized --nodefault --nofirststartwizard'
-                                       ' "--accept=pipe,name=openlp_pipe;urp;"')
+                                      ' "--accept=pipe,name=openlp_pipe;urp;"')
 
     def get_uno_command_when_no_command_exists_test(self):
         """