Fix tests

nsidc · Nov 14, 2023 · a33bf3a · a33bf3a
1 parent 64c0976
commit a33bf3a
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/tests/unit/test_store.py b/tests/unit/test_store.py
@@ -5,6 +5,7 @@
 import fsspec
 import pytest
 import responses
+import s3fs
 from earthaccess import Auth, Store
 
 
@@ -60,12 +61,22 @@ def test_store_can_create_s3_fsspec_session(self):
             "https://api.giovanni.earthdata.nasa.gov/s3credentials",
             "https://data.laadsdaac.earthdatacloud.nasa.gov/s3credentials",
         ]
+        mock_creds = {
+            "accessKeyId": "sure",
+            "secretAccessKey": "correct",
+            "sessionToken": "whynot",
+        }
+        expected_storage_options = {
+            "key": mock_creds["accessKeyId"],
+            "secret": mock_creds["secretAccessKey"],
+            "token": mock_creds["sessionToken"],
+        }
 
         for endpoint in custom_endpoints:
             responses.add(
                 responses.GET,
                 endpoint,
-                json={},
+                json=mock_creds,
                 status=200,
             )
 
@@ -74,40 +85,39 @@ def test_store_can_create_s3_fsspec_session(self):
                 responses.add(
                     responses.GET,
                     daac["s3-credentials"],
-                    json={
-                        "accessKeyId": "sure",
-                        "secretAccessKey": "correct",
-                        "sessionToken": "whynot",
-                    },
+                    json=mock_creds,
                     status=200,
                 )
         responses.add(
             responses.GET,
             "https://urs.earthdata.nasa.gov/profile",
-            json={},
+            json=mock_creds,
             status=200,
         )
 
         store = Store(self.auth)
         self.assertTrue(isinstance(store.auth, Auth))
         for daac in ["NSIDC", "PODAAC", "LPDAAC", "ORNLDAAC", "GES_DISC", "ASF"]:
             s3_fs = store.get_s3fs_session(daac=daac)
-            self.assertEqual(type(s3_fs), type(fsspec.filesystem("s3")))
+            assert isinstance(s3_fs, s3fs.S3FileSystem)
+            assert s3_fs.storage_options == expected_storage_options
 
         for endpoint in custom_endpoints:
             s3_fs = store.get_s3fs_session(endpoint=endpoint)
-            self.assertEqual(type(s3_fs), type(fsspec.filesystem("s3")))
+            assert isinstance(s3_fs, s3fs.S3FileSystem)
+            assert s3_fs.storage_options == expected_storage_options
 
         for provider in [
             "NSIDC_CPRD",
             "POCLOUD",
             "LPCLOUD",
-            "ORNLCLOUD",
+            "ORNL_CLOUD",
             "GES_DISC",
             "ASF",
         ]:
             s3_fs = store.get_s3fs_session(provider=provider)
-            assert isinstance(s3_fs, fsspec.AbstractFileSystem)
+            assert isinstance(s3_fs, s3fs.S3FileSystem)
+            assert s3_fs.storage_options == expected_storage_options
 
         # Ensure informative error is raised
         with pytest.raises(ValueError, match="parameters must be specified"):