use string_storage fixture more

Author: simonjayhawkins

pandas/tests/arrays/string_/test_string.py

@@ -14,30 +14,15 @@
 import pandas._testing as tm
 from pandas.core.arrays.string_arrow import ArrowStringArray
 
-skip_if_no_pyarrow = td.skip_if_no("pyarrow", min_version="1.0.0")
 
-
-@pytest.fixture(
-    params=[
-        pd.StringDtype(storage="python"),
-        pytest.param(
-            pd.StringDtype(storage="pyarrow"),
-            marks=skip_if_no_pyarrow,
-        ),
-    ]
-)
-def dtype(request):
-    return request.param
+@pytest.fixture
+def dtype(string_storage):
+    return pd.StringDtype(storage=string_storage)
 
 
-@pytest.fixture(
-    params=[
-        pd.arrays.StringArray,
-        pytest.param(ArrowStringArray, marks=skip_if_no_pyarrow),
-    ]
-)
-def cls(request):
-    return request.param
+@pytest.fixture
+def cls(dtype):
+    return dtype.construct_array_type()
 
 
 def test_repr(dtype):

pandas/tests/extension/test_string.py

@@ -18,8 +18,6 @@
 import numpy as np
 import pytest
 
-import pandas.util._test_decorators as td
-
 import pandas as pd
 from pandas.core.arrays.string_ import StringDtype
 from pandas.tests.extension import base
@@ -48,14 +46,9 @@ def chunked(request):
     return request.param
 
 
-@pytest.fixture(
-    params=[
-        "python",
-        pytest.param("pyarrow", marks=td.skip_if_no("pyarrow", min_version="1.0.0")),
-    ]
-)
-def dtype(request):
-    return StringDtype(storage=request.param)
+@pytest.fixture
+def dtype(string_storage):
+    return StringDtype(storage=string_storage)
 
 
 @pytest.fixture

pandas/tests/frame/methods/test_convert_dtypes.py

@@ -1,8 +1,6 @@
 import numpy as np
 import pytest
 
-import pandas.util._test_decorators as td
-
 import pandas as pd
 import pandas._testing as tm
 
@@ -11,15 +9,6 @@ class TestConvertDtypes:
     @pytest.mark.parametrize(
         "convert_integer, expected", [(False, np.dtype("int32")), (True, "Int32")]
     )
-    @pytest.mark.parametrize(
-        "string_storage",
-        [
-            "python",
-            pytest.param(
-                "pyarrow", marks=td.skip_if_no("pyarrow", min_version="1.0.0")
-            ),
-        ],
-    )
     def test_convert_dtypes(self, convert_integer, expected, string_storage):
         # Specific types are tested in tests/series/test_dtypes.py
         # Just check that it works for DataFrame here