From d52d5bb0e2e314e3bc2558a5952996de667e735f Mon Sep 17 00:00:00 2001 From: John Lines Date: Sun, 30 Jun 2019 20:13:33 +0100 Subject: [PATCH] Fix lint warning in tests and importer.py --- openlp/plugins/songs/lib/importer.py | 2 +- .../openlp_plugins/songs/test_singingthefaithimport.py | 6 ++---- tests/helpers/songfileimport.py | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py index f1c7db2cd..5fa758783 100644 --- a/openlp/plugins/songs/lib/importer.py +++ b/openlp/plugins/songs/lib/importer.py @@ -345,7 +345,7 @@ class SongFormat(object): 'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm', 'ProPresenter Song Files')) }, - SingingTheFaith: { + SingingTheFaith: { 'class': SingingTheFaithImport, 'name': 'SingingTheFaith', 'prefix': 'singingTheFaith', diff --git a/tests/functional/openlp_plugins/songs/test_singingthefaithimport.py b/tests/functional/openlp_plugins/songs/test_singingthefaithimport.py index 190466db3..fbbf2a3e1 100644 --- a/tests/functional/openlp_plugins/songs/test_singingthefaithimport.py +++ b/tests/functional/openlp_plugins/songs/test_singingthefaithimport.py @@ -44,7 +44,5 @@ class TestSingingTheFaithFileImport(SongImportTestHelper): self.file_import([TEST_PATH / 'H1.txt'], self.load_external_result_data(TEST_PATH / 'STF001.json')) # Whole song - currently not working - test needs debugging. -## self.file_import([TEST_PATH / 'H2.txt'], -## self.load_external_result_data(TEST_PATH / 'STF002.json')) - - + # self.file_import([TEST_PATH / 'H2.txt'], + # self.load_external_result_data(TEST_PATH / 'STF002.json')) diff --git a/tests/helpers/songfileimport.py b/tests/helpers/songfileimport.py index 5229b6f51..0c007fa18 100644 --- a/tests/helpers/songfileimport.py +++ b/tests/helpers/songfileimport.py @@ -123,7 +123,8 @@ class SongImportTestHelper(TestCase): log.debug("Song copyright imported: %s" % importer.song_number) log.debug("Topics imported: %s" % importer.topics) - assert importer.title == title, 'title for %s should be "%s" and is "%s"' % (source_file_name, title, importer.title) + assert importer.title == title, \ + 'title for %s should be "%s" and is "%s"' % (source_file_name, title, importer.title) for author in author_calls: if isinstance(author, str): self.mocked_add_author.assert_any_call(author)