Commit Graph

2350 Commits

Author SHA1 Message Date
Raoul Snyman 8c3fd99ed5 Fix missing line 2017-11-15 00:03:35 -07:00
Raoul Snyman d05e39fc70 Fix up test after merges 2017-11-14 23:55:57 -07:00
Raoul Snyman 1c10227c38 HEAD 2017-11-14 17:01:57 -07:00
Raoul Snyman e5c9b7c98e Merge from upstream 2017-11-14 17:01:19 -07:00
Raoul Snyman 1cb11832bd Added some tests for the settings upgrade and fixed a bug I had introduced. 2017-11-14 00:19:10 -07:00
Tim Bentley 12b71fc068 head 2017-11-11 08:35:02 +00:00
Raoul Snyman 6b0de04694 HEAD + Regrouped upgrades 2017-11-10 23:54:54 -07:00
Phill f302b21c4c Fixed a number of bugs, and tests.
Failing on Code Analysis2, but this looks like fallout from the refactors (it hasn't passed since the beginning of october)

Also contains superflys branch lp:~raoul-snyman/openlp/fix-linting

--------------------------------
lp:~phill-ridout/openlp/fixes-mkII (revision 2794)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2276/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2178/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests...

bzr-revno: 2784
2017-11-10 22:36:52 -07:00
Phill Ridout 9dc68269aa Merge superflys branch 2017-11-10 20:39:39 +00:00
Raoul Snyman 3a404f074c Merge in Phil's changes 2017-11-09 21:47:37 -07:00
Raoul Snyman a408e3d74e Fix some linting issues, and fix the test for newer versions of PyLint 2017-11-09 21:11:03 -07:00
Tim Bentley e0341ab3eb fix tests 2017-11-09 21:24:38 +00:00
Phill Ridout 536a187fb9 PEP8 2017-11-09 20:39:17 +00:00
Phill Ridout 881c3648cc Test fixes 2017-11-09 20:24:46 +00:00
Phill Ridout f307568cbb Misc test fixes 2017-11-03 22:52:24 +00:00
Phill Ridout 3cf0be000b head 2017-11-03 22:46:27 +00:00
Phill Ridout 94dd107abe Changed merged errors
Fixes: https://launchpad.net/bugs/1400415
2017-11-03 20:55:41 +00:00
Raoul Snyman 8b34852236 Rename some tests so that they can be picked up by nose2; Fix some patches that were wrong; Fix a bug in our code that the now running tests picked up 2017-10-28 23:01:25 -07:00
Phill Ridout fe5430e157 HEAD 2017-10-27 22:11:29 +01:00
Raoul Snyman d5ab3340eb Move widgets to a widgets module 2017-10-23 15:09:57 -07:00
Raoul Snyman 15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
Raoul Snyman 4d68382d52 Fix some issues from the mergefest
bzr-revno: 2779
2017-10-09 19:40:41 -07:00
Raoul Snyman bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
Raoul Snyman 7086c88c7c Fix a test that was failing (not sure why) 2017-10-09 18:08:09 -07:00
Raoul Snyman b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Tim Bentley b07f2e9f86 head 2017-10-01 21:11:03 +01:00
Philip Ridout 70e50f4aaa Pep fixes 2017-09-30 23:45:24 +01:00
Philip Ridout d8a32d3962 HEAD 2017-09-30 22:47:50 +01:00
Philip Ridout ab49b8b8ad pathlib changes for song plugin 2017-09-30 21:16:30 +01:00
Tim Bentley 5203518ccb head 2017-09-29 19:53:22 +01:00
Tim Bentley d77f0127e8 head 2017-09-29 19:42:15 +01:00
Raoul Snyman 11fbad77dc Fix some linting issues 2017-09-29 08:55:39 -07:00
Raoul Snyman 0dcf3de267 Tests! 2017-09-28 20:06:00 -07:00
Tim Bentley e2fd8beb2a fix tests 2017-09-27 20:16:24 +01:00
Tim Bentley bfc8a5ae8c fix tests 2017-09-27 20:12:22 +01:00
Tim Bentley 9d6bd78a70 head 2017-09-26 21:34:47 +01:00
Tim Bentley 4451b65f04 add files2 2017-09-26 21:34:08 +01:00
Tim Bentley b783783a29 add files 2017-09-26 21:33:58 +01:00
Tim Bentley 5b2ac0f97b more moves 2017-09-26 18:49:41 +01:00
Philip Ridout 69fca430b5 HEAD 2017-09-26 17:42:54 +01:00
Philip Ridout 10b13872e5 Modify themes to work with pathlib 2017-09-26 17:39:13 +01:00
Raoul Snyman e90836e817 Fix up some issues with one of the tests 2017-09-25 13:34:05 -07:00
Raoul Snyman 4bb031b22e HEAD 2017-09-25 12:55:33 -07:00
Raoul Snyman cff194d320 Skip Bible HTTP tests on Jenkins to prevent the server from being blacklisted 2017-09-25 11:50:24 -07:00
Philip Ridout 047a1b3808 pep fixes 2017-09-24 20:33:07 +01:00
Philip Ridout d52fff75a4 Test fox 2017-09-24 19:59:49 +01:00
Philip Ridout d61ed7e9b1 converted the image plugin over to using Path objects 2017-09-23 14:06:42 +01:00
Raoul Snyman 7239b1e400 Add a mock main_window 2017-09-22 22:23:56 -07:00
Raoul Snyman 50511c4953 HEAD 2017-09-22 21:04:41 -07:00
Phill 35e9300be2 More pathlib changes, focused mainly on the presentation plugin
Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/pathlib5 (revision 2777)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2193/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2096/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1983/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1353/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/...

bzr-revno: 2768
2017-09-22 20:53:59 -07:00