fix test_nightlight.test_load_nightlight_noaa interference

Author: emanuel-schmid

climada/entity/exposures/litpop/nightlight.py

@@ -543,11 +543,11 @@ def load_nightlight_noaa(ref_year=2013, sat_name=None):
                              str(ref_year) + '*.stable_lights.avg_vis'))
     # check if file exists in SYSTEM_DIR, download if not
     if glob.glob(fn_light + ".p"):
-        fn_light = glob.glob(fn_light + ".p")[0]
+        fn_light = sorted(glob.glob(fn_light + ".p"))[0]
         with open(fn_light, 'rb') as f_nl:
             nightlight = pickle.load(f_nl)
     elif glob.glob(fn_light + ".tif.gz"):
-        fn_light = glob.glob(fn_light + ".tif.gz")[0]
+        fn_light = sorted(glob.glob(fn_light + ".tif.gz"))[0]
         fn_light, nightlight = unzip_tif_to_py(fn_light)
     else:
         # iterate over all satellites if no satellite name provided

climada/test/test_nightlight.py

@@ -185,29 +185,30 @@ def test_load_nightlight_noaa(self):
             # compressed image to a gzip file
             with gzip.GzipFile(SYSTEM_DIR.joinpath(gzfile), 'wb') as f:
                 f.write(mem.getvalue())
-        SYSTEM_DIR.joinpath(pfile).unlink(missing_ok=True)
-
-        # using already existing file and without providing arguments
-        night, coord_nl, fn_light = nightlight.load_nightlight_noaa()
-        self.assertIsInstance(night, sparse._csr.csr_matrix)
-        self.assertIn(tiffile, str(fn_light))
-        self.assertTrue(np.array_equal(np.array([[-65, NOAA_RESOLUTION_DEG],
-                                    [-180, NOAA_RESOLUTION_DEG]]),coord_nl))
-        SYSTEM_DIR.joinpath(pfile).unlink()
-
-        # with arguments
-        night, coord_nl, fn_light = nightlight.load_nightlight_noaa(ref_year=year, sat_name=sat_name)
-        self.assertIsInstance(night, sparse._csr.csr_matrix)
-        self.assertIn(tiffile, str(fn_light))
-        SYSTEM_DIR.joinpath(pfile).unlink()
-        SYSTEM_DIR.joinpath(gzfile).unlink()
-
-        # test raises from wrong input agruments
-        with self.assertRaises(ValueError) as cm:
-            night, coord_nl, fn_light = nightlight.load_nightlight_noaa(
-                                            ref_year=2050, sat_name='F150')
-        self.assertEqual('Nightlight intensities for year 2050 and satellite F150 do not exist.',
-                            str(cm.exception))
+             
+        try:
+            # with arguments
+            night, coord_nl, fn_light = nightlight.load_nightlight_noaa(ref_year=year, sat_name=sat_name)
+            self.assertIsInstance(night, sparse._csr.csr_matrix)
+            self.assertIn(tiffile, str(fn_light))
+
+            # using already existing file and without providing arguments
+            night, coord_nl, fn_light = nightlight.load_nightlight_noaa()
+            self.assertIsInstance(night, sparse._csr.csr_matrix)
+            self.assertIn(pfile, str(fn_light))
+            self.assertTrue(np.array_equal(np.array([[-65, NOAA_RESOLUTION_DEG],
+                                        [-180, NOAA_RESOLUTION_DEG]]),coord_nl))
+
+            # test raises from wrong input agruments
+            with self.assertRaises(ValueError) as cm:
+                night, coord_nl, fn_light = nightlight.load_nightlight_noaa(
+                                                ref_year=2050, sat_name='F150')
+            self.assertEqual('Nightlight intensities for year 2050 and satellite F150 do not exist.',
+                                str(cm.exception))
+        finally:
+            # clean up
+            SYSTEM_DIR.joinpath(pfile).unlink(missing_ok=True)
+            SYSTEM_DIR.joinpath(gzfile).unlink(missing_ok=True)
 
     def test_untar_noaa_stable_nighlight(self):
         """ Testing that input .tar file is moved into SYSTEM_DIR,