fixes

Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
anmyachev · Jan 18, 2024 · 10ab1f9 · 10ab1f9
1 parent d5cf2ee
commit 10ab1f9
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/modin/pandas/test/test_io.py b/modin/pandas/test/test_io.py
@@ -1939,7 +1939,7 @@ def test_read_parquet_hdfs(self, engine):
         "path_type",
         ["object", "directory", "url"],
     )
-    def test_read_parquet_s3(self, s3_resource, path_type, engine, storage_options):
+    def test_read_parquet_s3(self, s3_resource, path_type, engine, s3_storage_options):
         s3_path = "s3://modin-test/modin-bugs/test_data.parquet"
         if path_type == "object":
             import s3fs
@@ -1952,14 +1952,14 @@ def test_read_parquet_s3(self, s3_resource, path_type, engine, storage_options):
             eval_io(
                 "read_parquet",
                 path=s3_path,
-                storage_options=storage_options,
+                storage_options=s3_storage_options,
                 engine=engine,
             )
         else:
             eval_io(
                 "read_parquet",
                 path=s3_path,
-                storage_options=storage_options,
+                storage_options=s3_storage_options,
                 engine=engine,
             )
 
@@ -2136,17 +2136,17 @@ def comparator(df1, df2):
         )
 
     @pytest.mark.parametrize(
-        "storage_options",
+        "storage_options_extra",
         [{"anon": False}, {"anon": True}, {"key": "123", "secret": "123"}, None],
     )
-    def test_read_json_s3(self, s3_resource, storage_options):
+    def test_read_json_s3(self, s3_resource, s3_storage_options, storage_options_extra):
         s3_path = "s3://modin-test/testing/test_data.json"
         eval_io(
             fn_name="read_json",
             path_or_buf=s3_path,
             lines=True,
             orient="records",
-            storage_options=storage_options,
+            storage_options=s3_storage_options | storage_options_extra,
         )
 
     def test_read_json_categories(self):
@@ -2932,15 +2932,15 @@ def test_read_fwf_empty_frame(self, make_fwf_file):
         df_equals(modin_df, pandas_df)
 
     @pytest.mark.parametrize(
-        "storage_options",
+        "storage_options_extra",
         [{"anon": False}, {"anon": True}, {"key": "123", "secret": "123"}, None],
     )
-    def test_read_fwf_s3(self, s3_resource, storage_options):
+    def test_read_fwf_s3(self, s3_resource, s3_storage_options, storage_options_extra):
         s3_path = "s3://modin-test/modin-bugs/test_data.fwf"
         eval_io(
             fn_name="read_fwf",
             filepath_or_buffer=s3_path,
-            storage_options=storage_options,
+            storage_options=s3_storage_options | storage_options_extra,
         )
 
 
@@ -3031,15 +3031,17 @@ def comparator(df1, df2):
         )
 
     @pytest.mark.parametrize(
-        "storage_options",
+        "storage_options_extra",
         [{"anon": False}, {"anon": True}, {"key": "123", "secret": "123"}, None],
     )
-    def test_read_feather_s3(self, s3_resource, storage_options):
+    def test_read_feather_s3(
+        self, s3_resource, s3_storage_options, storage_options_extra
+    ):
         s3_path = "s3://modin-test/modin-bugs/test_data.feather"
         eval_io(
             fn_name="read_feather",
             path=s3_path,
-            storage_options=storage_options,
+            storage_options=s3_storage_options | storage_options_extra,
         )
 
     def test_read_feather_path_object(self, make_feather_file):