Merge lp:~sam92/openlp/bug-1154467 into lp:openlp
Proposed by
Samuel Mehrbrodt
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raoul Snyman | ||||
Approved revision: | 2352 | ||||
Merged at revision: | 2365 | ||||
Proposed branch: | lp:~sam92/openlp/bug-1154467 | ||||
Merge into: | lp:openlp | ||||
Diff against target: |
90 lines (+64/-1) 2 files modified
openlp/plugins/bibles/lib/db.py (+8/-1) tests/functional/openlp_plugins/songs/test_zionworximport.py (+56/-0) |
||||
To merge this branch: | bzr merge lp:~sam92/openlp/bug-1154467 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+215964@code.launchpad.net |
This proposal supersedes a proposal from 2014-04-10.
Description of the change
Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[FAILURE] http://
To post a comment you must log in.
Please try to make your tests a little bit more substantial.