← Back to team overview

openlp-core team mailing list archive

Re: [Merge] lp:~raoul-snyman/openlp/db-upgrades-2.6 into lp:openlp

 

Review: Needs Fixing

Please do not comment out unneeded code!

Diff comments:

> 
> === modified file 'tests/functional/openlp_plugins/remotes/test_router.py'
> --- tests/functional/openlp_plugins/remotes/test_router.py	2017-03-04 16:51:51 +0000
> +++ tests/functional/openlp_plugins/remotes/test_router.py	2017-03-11 00:02:53 +0000
> @@ -336,11 +336,13 @@
>          with patch.object(self.service_manager, 'setup_ui'), \
>                  patch.object(self.router, 'do_json_header'):
>              self.service_manager.bootstrap_initialise()
> -            self.app.processEvents()
> +            # Not sure why this is here, it doesn't make sense in the test and causes them to hang
> +            # self.app.processEvents()

If the test passes and it is not needed Delete it.

>  
>              # WHEN: Remote next is received
>              self.router.service(action='next')
> -            self.app.processEvents()
> +            # Not sure why this is here, it doesn't make sense in the test and causes them to hang
> +            # self.app.processEvents()
>  
>              # THEN: service_manager.next_item() should have been called
>              self.assertTrue(mocked_next_item.called, 'next_item() should have been called in service_manager')
> 
> === added file 'tests/interfaces/openlp_plugins/bibles/forms/__init__.py'
> === modified file 'tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py'
> --- tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py	2016-12-31 11:01:36 +0000
> +++ tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py	2017-03-11 00:02:53 +0000
> @@ -49,12 +49,12 @@
>          bibleimportform.PYSWORD_AVAILABLE = False
>          self.form = bibleimportform.BibleImportForm(self.main_window, MagicMock(), MagicMock())
>  
> -    def tearDown(self):
> -        """
> -        Delete all the C++ objects at the end so that we don't have a segfault
> -        """
> -        del self.form
> -        del self.main_window
> +    # def tearDown(self):

Delete me !

> +        # """
> +        # Delete all the C++ objects at the end so that we don't have a segfault
> +        # """
> +        # del self.form
> +        # del self.main_window
>  
>      @patch('openlp.plugins.bibles.forms.bibleimportform.CWExtract.get_bibles_from_http')
>      @patch('openlp.plugins.bibles.forms.bibleimportform.BGExtract.get_bibles_from_http')


-- 
https://code.launchpad.net/~raoul-snyman/openlp/db-upgrades-2.6/+merge/319632
Your team OpenLP Core is subscribed to branch lp:openlp.


References