From e2355ef728059e241f4cb766226da8f9447097e3 Mon Sep 17 00:00:00 2001 From: Martin Raspaud Date: Wed, 7 Feb 2018 10:56:55 +0100 Subject: [PATCH 1/2] Fix the nc_nwcsaf_pps reader config for file finding compatibility --- satpy/etc/readers/nc_nwcsaf_pps.yaml | 2 +- satpy/tests/test_readers.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/satpy/etc/readers/nc_nwcsaf_pps.yaml b/satpy/etc/readers/nc_nwcsaf_pps.yaml index a34fe054d3..ce2e509bb4 100644 --- a/satpy/etc/readers/nc_nwcsaf_pps.yaml +++ b/satpy/etc/readers/nc_nwcsaf_pps.yaml @@ -1,6 +1,6 @@ reader: description: NetCDF4 reader for the NWCSAF/PPS 2014 format - name: nc_nwcsaf + name: nc_nwcsaf_pps sensors: ['avhrr-3', 'viirs', 'modis'] default_channels: [] reader: !!python/name:satpy.readers.yaml_reader.FileYAMLReader diff --git a/satpy/tests/test_readers.py b/satpy/tests/test_readers.py index f41bec47ae..6dfad82a93 100644 --- a/satpy/tests/test_readers.py +++ b/satpy/tests/test_readers.py @@ -192,6 +192,20 @@ def test_reader_name(self): finally: os.remove(fn) + + def test_reader_other_name(self): + """Test with default base_dir and reader specified""" + from satpy.readers import find_files_and_readers + fn = 'S_NWC_CPP_npp_32505_20180204T1114116Z_20180204T1128227Z.nc' + # touch the file so it exists on disk + open(fn, 'w') + try: + ri = find_files_and_readers(reader='nc_nwcsaf_pps') + self.assertListEqual(list(ri.keys()), ['nc_nwcsaf_pps']) + self.assertListEqual(ri['nc_nwcsaf_pps'], [fn]) + finally: + os.remove(fn) + def test_reader_name_matched_start_end_time(self): """Test with start and end time matching the filename""" from satpy.readers import find_files_and_readers From 04e753dbc05b4f6b74ee8d071c55755c7e60ecdc Mon Sep 17 00:00:00 2001 From: Martin Raspaud Date: Wed, 7 Feb 2018 11:01:22 +0100 Subject: [PATCH 2/2] Make flake8 happy --- satpy/tests/test_readers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/satpy/tests/test_readers.py b/satpy/tests/test_readers.py index 6dfad82a93..1371e53fe2 100644 --- a/satpy/tests/test_readers.py +++ b/satpy/tests/test_readers.py @@ -192,7 +192,6 @@ def test_reader_name(self): finally: os.remove(fn) - def test_reader_other_name(self): """Test with default base_dir and reader specified""" from satpy.readers import find_files_and_readers