openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/song-select-import-test-fix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/song-select-import-test-fix/+merge/250227

Fix duplicate test names in songselect test

lp:~alisonken1/openlp/song-select-import-test-fix (revision 2502)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/955/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/881/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/825/
[SUCCESS] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/717/
[SUCCESS] http://ci.openlp.org/job/Branch-04b-Windows_Interface_Tests/316/
[FAILURE] http://ci.openlp.org/job/Branch-05a-Code_Analysis/453/
Stopping after failure

Code analysis failure is:
openlp/branch/openlp/core/common/historycombobox.py
Not part of this branch
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/song-select-import-test-fix into lp:openlp.

=== modified file 'tests/functional/openlp_plugins/songs/test_songselect.py'
--- tests/functional/openlp_plugins/songs/test_songselect.py	2015-02-06 22:21:01 +0000
+++ tests/functional/openlp_plugins/songs/test_songselect.py	2015-02-18 22:13:45 +0000
@@ -491,7 +491,6 @@
     def songselect_import_usr_file_test(self):
         """
         Verify import SongSelect USR file parses file properly
-        :return:
         """
         # GIVEN: Text file to import and mocks
         copyright = '2011 OpenLP Programmer One (Admin. by OpenLP One) | ' \
@@ -510,14 +509,13 @@
             self.assertEquals(song_import.title, self.title, 'Song title should match')
             self.assertEquals(song_import.ccli_number, self.ccli_number, 'CCLI Song Number should match')
             self.assertEquals(song_import.authors, self.authors, 'Author(s) should match')
-            self.assertEquals(song_import.copyright, self.copyright_usr, 'Copyright should match')
+            self.assertEquals(song_import.copyright, copyright, 'Copyright should match')
             self.assertEquals(song_import.topics, self.topics, 'Theme(s) should match')
-            self.assertEquals(song_import.verses, self.verses, 'Verses should match with test verses')
+            self.assertEquals(song_import.verses, verses, 'Verses should match with test verses')
 
-    def songselect_import_usr_file_test(self):
+    def songselect_import_usr_file_2_test(self):
         """
-        Verify import SongSelect USR file parses file properly
-        :return:
+        Verify import SongSelect TEXT file parses file properly
         """
         # GIVEN: Text file to import and mocks
         copyright = '© 2011 OpenLP Programmer One (Admin. by OpenLP One)'