Use consistent names for pytest fixtures (#1965)

Author: seisman

pygmt/tests/test_clib.py

@@ -28,8 +28,8 @@
 POINTS_DATA = os.path.join(TEST_DATA_DIR, "points.txt")
 
 
-@pytest.fixture(scope="module")
-def data():
+@pytest.fixture(scope="module", name="data")
+def fixture_data():
     """
     Load the point data from the test file.
     """

pygmt/tests/test_contour.py

@@ -14,16 +14,16 @@
 POINTS_DATA = os.path.join(TEST_DATA_DIR, "points.txt")
 
 
-@pytest.fixture(scope="module")
-def data():
+@pytest.fixture(scope="module", name="data")
+def fixture_data():
     """
     Load the point data from the test file.
     """
     return pd.read_table(POINTS_DATA, header=None, sep=r"\s+")
 
 
-@pytest.fixture(scope="module")
-def region():
+@pytest.fixture(scope="module", name="region")
+def fixture_region():
     """
     The data region.
     """

pygmt/tests/test_dimfilter.py

@@ -20,7 +20,7 @@ def fixture_grid():
 
 
 @pytest.fixture(scope="module", name="expected_grid")
-def fixture_grid_result():
+def fixture_expected_grid():
     """
     Load the expected dimfilter grid result.
     """

pygmt/tests/test_filter1d.py

@@ -14,7 +14,7 @@
 
 
 @pytest.fixture(scope="module", name="data")
-def fixture_table():
+def fixture_data():
     """
     Load the @MaunaLoa_CO2.txt dataset as a pandas dataframe.
     """

pygmt/tests/test_grdclip.py

@@ -19,7 +19,7 @@ def fixture_grid():
 
 
 @pytest.fixture(scope="module", name="expected_grid")
-def fixture_grid_result():
+def fixture_expected_grid():
     """
     Load the expected grdclip grid result.
     """

pygmt/tests/test_grdcut.py

@@ -27,7 +27,7 @@ def fixture_region():
 
 
 @pytest.fixture(scope="module", name="expected_grid")
-def fixture_grid_result():
+def fixture_expected_grid():
     """
     Load the expected grdcut grid result.
     """

pygmt/tests/test_grdfill.py

@@ -29,7 +29,7 @@ def fixture_grid():
 
 
 @pytest.fixture(scope="module", name="expected_grid")
-def fixture_grid_result():
+def fixture_expected_grid():
     """
     Load the expected grdfill grid result.
     """

pygmt/tests/test_grdfilter.py

@@ -21,7 +21,7 @@ def fixture_grid():
 
 
 @pytest.fixture(scope="module", name="expected_grid")
-def fixture_grid_result():
+def fixture_expected_grid():
     """
     Load the expected grdfilter grid result.
     """

pygmt/tests/test_grdgradient.py

@@ -20,7 +20,7 @@ def fixture_grid():
 
 
 @pytest.fixture(scope="module", name="expected_grid")
-def fixture_grid_result():
+def fixture_expected_grid():
     """
     Load the expected grdgradient grid result.
     """

pygmt/tests/test_grdhisteq.py

@@ -30,7 +30,7 @@ def fixture_region():
 
 
 @pytest.fixture(scope="module", name="expected_grid")
-def fixture_grid_result():
+def fixture_expected_grid():
     """
     Load the expected grdhisteq grid result.
     """
@@ -42,7 +42,7 @@ def fixture_grid_result():
 
 
 @pytest.fixture(scope="module", name="expected_df")
-def fixture_df_result():
+def fixture_expected_df():
     """
     Load the expected grdhisteq table result.
     """