openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Review: Needs Information

I'm not sure about those patches that were changed (see in line) isn't patching supposed to take place in the module they're imported in to?

Diff comments:

> 
> === modified file 'tests/functional/openlp_plugins/bibles/test_csvimport.py'
> --- tests/functional/openlp_plugins/bibles/test_csvimport.py	2017-12-29 09:15:48 +0000
> +++ tests/functional/openlp_plugins/bibles/test_csvimport.py	2018-08-21 22:59:09 +0000
> @@ -134,7 +134,7 @@
>  
>          with patch('openlp.plugins.bibles.lib.importers.csvbible.get_file_encoding',
>                     return_value={'encoding': 'utf-8', 'confidence': 0.99}),\
> -                patch('openlp.plugins.bibles.lib.importers.csvbible.Path.open', create=True) as mocked_open,\
> +                patch('openlp.core.common.path.Path.open', create=True) as mocked_open,\

Not sure this is correct. Shouldn't the object be patched where they're imported?

>                  patch('openlp.plugins.bibles.lib.importers.csvbible.csv.reader',
>                        return_value=iter(test_data)) as mocked_reader:
>  
> @@ -154,7 +154,7 @@
>          # GIVEN: Mocked a mocked open object which raises an OSError
>          with patch('openlp.plugins.bibles.lib.importers.csvbible.get_file_encoding',
>                     return_value={'encoding': 'utf-8', 'confidence': 0.99}),\
> -                patch('openlp.plugins.bibles.lib.importers.csvbible.Path.open', side_effect=OSError, create=True):
> +                patch('openlp.core.common.path.Path.open', side_effect=OSError, create=True):

see above ^

>  
>              # WHEN: Calling CSVBible.parse_csv_file
>              # THEN: A ValidationError should be raised
> @@ -169,7 +169,7 @@
>          # GIVEN: Mocked a csv.reader which raises an csv.Error
>          with patch('openlp.plugins.bibles.lib.importers.csvbible.get_file_encoding',
>                     return_value={'encoding': 'utf-8', 'confidence': 0.99}),\
> -                patch('openlp.plugins.bibles.lib.importers.csvbible.Path.open', create=True),\
> +                patch('openlp.core.common.path.Path.open', create=True),\

see above ^

>                  patch('openlp.plugins.bibles.lib.importers.csvbible.csv.reader', side_effect=csv.Error):
>  
>              # WHEN: Calling CSVBible.parse_csv_file


-- 
https://code.launchpad.net/~thelinuxguy/openlp/flake-fixes/+merge/353535
Your team OpenLP Core is subscribed to branch lp:openlp.