openlp-core team mailing list archive

[Samuel Mehrbrodt <s.mehrbrodt@xxxxxxxxx>]

Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/bug-1154467 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1154467 in OpenLP: "Web download bible db's getting locked"
  https://bugs.launchpad.net/openlp/+bug/1154467

For more details, see:
https://code.launchpad.net/~sam92/openlp/bug-1154467/+merge/215293

Attempt to fix bug #1154467 by waiting 10ms and retrying the commit

[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/266/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/227/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/176/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/137/
[FAILURE] http://ci.openlp.org/job/Branch-05-Code-Analysis/93/
-- 
https://code.launchpad.net/~sam92/openlp/bug-1154467/+merge/215293
Your team OpenLP Core is requested to review the proposed merge of lp:~sam92/openlp/bug-1154467 into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2014-04-01 17:32:19 +0000
+++ openlp/plugins/bibles/lib/db.py	2014-04-10 20:22:05 +0000
@@ -32,9 +32,11 @@
 import os
 import re
 import sqlite3
+import time
 
 from PyQt4 import QtCore
 from sqlalchemy import Column, ForeignKey, Table, or_, types, func
+from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm import class_mapper, mapper, relation
 from sqlalchemy.orm.exc import UnmappedClassError
 
@@ -235,7 +237,12 @@
                 text=verse_text
             )
             self.session.add(verse)
-        self.session.commit()
+        try:
+            self.session.commit()
+        except OperationalError:
+            # Wait 10ms and try again (lp#1154467)
+            time.sleep(0.01)
+            self.session.commit()
 
     def create_verse(self, book_id, chapter, verse, text):
         """

=== added file 'tests/functional/openlp_plugins/songs/test_zionworximport.py'
--- tests/functional/openlp_plugins/songs/test_zionworximport.py	1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_plugins/songs/test_zionworximport.py	2014-04-10 20:22:05 +0000
@@ -0,0 +1,56 @@
+# -*- 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                          #
+###############################################################################
+"""
+This module contains tests for the ZionWorx song importer.
+"""
+
+from unittest import TestCase
+
+from tests.functional import MagicMock, patch
+from openlp.plugins.songs.lib.zionworximport import ZionWorxImport
+from openlp.plugins.songs.lib.songimport import SongImport
+
+
+class TestZionWorxImport(TestCase):
+    """
+    Test the functions in the :mod:`zionworximport` module.
+    """
+    def create_importer_test(self):
+        """
+        Test creating an instance of the ZionWorx file importer
+        """
+        # GIVEN: A mocked out SongImport class, and a mocked out "manager"
+        with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
+            mocked_manager = MagicMock()
+
+            # WHEN: An importer object is created
+            importer = ZionWorxImport(mocked_manager, filenames=[])
+
+            # THEN: The importer should be an instance of SongImport
+            self.assertIsInstance(importer, SongImport)