Commit Graph

602 Commits

Author SHA1 Message Date
Jonathan Springer ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Jonathan Springer b6e0aa6c2e PEP8 clean up in tests 2014-04-16 16:44:22 -04:00
Jonathan Springer f7a23737f2 merge trunk 2014-04-16 16:26:24 -04:00
Samuel Mehrbrodt d65d1c016c Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
bzr-revno: 2365
2014-04-16 21:13:40 +02:00
Jonathan Springer cebec89556 merge trunk 2014-04-16 04:00:19 -04:00
Jonathan Springer ebc4476fdd Fixes first time wizard to use url and paths in web config file
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt c20939215a PDF Fixes
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt 49773de4f6 Fix transparent theme on OS X
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
2014-04-16 05:44:21 +01:00
Andreas Preikschat cb29c78bb0 Print repository name and revision number when using script (especially the revno is interesting for devs)
+Tell jenkins who triggered the build
+Added a blacklist for outdated tokens
+Use colours to indicate success/failure
+fixed job names

bzr-revno: 2361
2014-04-16 05:42:16 +01:00
Samuel Mehrbrodt 30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt 5c20fbba22 Trunk 2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Stefan Strasser db955cbf96 Some enhancements for songbeamer-import
bzr-revno: 2358
2014-04-15 22:52:14 +02:00
Jonathan Springer 721bcc20e2 Reorder imports 2014-04-15 16:51:55 -04:00
Samuel Mehrbrodt 8c18659adb Update verse order when verse names change (OpenLyrics Import)
bzr-revno: 2357
2014-04-15 22:46:54 +02:00
Andreas Preikschat dbd6d74c8d removed not wanted code 2014-04-15 22:30:20 +02:00
Andreas Preikschat 5090a014ae use self.assert and friends 2014-04-15 22:27:32 +02:00
Jonathan Springer 87e1c5d986 Add tests for First Time Wizards web config file 2014-04-15 14:44:33 -04:00
Samuel Mehrbrodt 71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt 4b76bfc615 Trunk 2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt 4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt ccc138413e Trunk 2014-04-15 10:15:07 +02:00
Stefan Strasser 5e1a7ce767 replaced all occurrences of the deprecated alias assertEquals() with assertEqual() 2014-04-15 07:28:51 +02:00
Samuel Mehrbrodt e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat 0c2112091d fixed spelling 2014-04-14 21:36:07 +02:00
Andreas Preikschat 8cc3f3b968 head 2014-04-14 21:02:19 +02:00
Andreas Preikschat 2c8d163b09 fixed assertion message 2014-04-14 20:59:28 +02:00
Andreas Preikschat 877fd135d3 head 2014-04-14 20:53:33 +02:00
Stefan Strasser 4a4f8c060b Songbeamer-import-test: replaced usage of assert with the testcase-functions assertTrue, assertEqual, assertIsNone; replaced all occurrences of assertEquals() with assertEqual() (deprecated alias) 2014-04-14 20:33:34 +02:00
Stefan Strasser 0293815135 Songbeamer-import: added check_verse_marks_test to test the correct detection of different lines that may occur 2014-04-13 19:08:38 +02:00
Samuel Mehrbrodt 758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt e0a85a668b Leading whitespace 2014-04-13 12:45:53 +02:00
Samuel Mehrbrodt f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Raoul Snyman b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Raoul Snyman 672eed037c HEAD 2014-04-12 21:48:15 +02:00
Andreas Preikschat 487f4279dd fixed blank line 2014-04-12 19:11:32 +02:00
Andreas Preikschat 321fed97e9 more output for the jenkins script 2014-04-12 18:52:29 +02:00
Andreas Preikschat 2c93a5840b head 2014-04-12 18:05:27 +02:00
Jonathan Springer 991eb6d004 Fix debug messages (bug #1170231)
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer 307f46921c Merge trunk 2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt 93cd8269f8 Test case 2014-04-10 21:50:30 +02:00
Samuel Mehrbrodt ed250c400d Test 2014-04-09 13:10:18 +02:00
Samuel Mehrbrodt 31649b0a8e Better test 2014-04-08 23:20:51 +02:00
Samuel Mehrbrodt 11884adbed Disable two tests for the moment 2014-04-08 23:07:43 +02:00
Samuel Mehrbrodt bfc086749b Test 2014-04-08 23:03:04 +02:00
Jonathan Springer 25c3503397 Add test to check for proper handling of service files passed in through the command line. 2014-04-08 16:45:40 -04:00
Samuel Mehrbrodt 5b3a58d1d6 Add newline 2014-04-08 18:40:06 +02:00
Samuel Mehrbrodt 129f726d4c Rename method 2014-04-08 17:23:40 +02:00
Samuel Mehrbrodt 791fdba019 Fix test 2014-04-08 17:15:46 +02:00
Samuel Mehrbrodt 1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00