Fixing naming conventions in test fixtures to be a bit more uniform

pyuvdata/uvdata/tests/test_uvdata.py

@@ -11251,10 +11251,10 @@ def test_from_file(filename):
 
 @pytest.mark.parametrize("add_type", ["blt", "freq", "pol"])
 @pytest.mark.parametrize("sort_type", ["blt", "freq", "pol"])
-@pytest.mark.parametrize("future_array_shapes", [True, False])
+@pytest.mark.parametrize("future_shapes", [True, False])
 @pytest.mark.filterwarnings("ignore:The uvw_array does not match the expected values")
-def test_add_pol_sorting_bl(casa_uvfits, add_type, sort_type, future_array_shapes):
-    if future_array_shapes:
+def test_add_pol_sorting_bl(casa_uvfits, add_type, sort_type, future_shapes):
+    if future_shapes:
         casa_uvfits.use_future_array_shapes()
 
     if add_type == "pol":
@@ -11315,9 +11315,9 @@ def test_add_pol_sorting_bl(casa_uvfits, add_type, sort_type, future_array_shape
 
 
 @pytest.mark.parametrize("dataset", ["hera", "mwa"])
-@pytest.mark.parametrize("future_array_shapes", [True, False])
+@pytest.mark.parametrize("future_shapes", [True, False])
 @pytest.mark.filterwarnings("ignore:The uvw_array does not match the expected values")
-def test_auto_check(hera_uvh5, uv_phase_comp, future_array_shapes, dataset, tmp_path):
+def test_auto_check(hera_uvh5, uv_phase_comp, future_shapes, dataset, tmp_path):
     """
     Checks that checking/fixing the autos works correctly, both with dual-pol data
     (supplied by hera_uvh5) and full-pol data (supplied by casa_uvfits).
@@ -11327,7 +11327,7 @@ def test_auto_check(hera_uvh5, uv_phase_comp, future_array_shapes, dataset, tmp_
     elif dataset == "mwa":
         uv, _ = uv_phase_comp
 
-    if future_array_shapes:
+    if future_shapes:
         uv.use_future_array_shapes()
 
     out_file = os.path.join(tmp_path, "auto_check.uvh5")
@@ -11358,7 +11358,7 @@ def test_auto_check(hera_uvh5, uv_phase_comp, future_array_shapes, dataset, tmp_
 
     assert uv1 == uv2
 
-    if future_array_shapes:
+    if future_shapes:
         uv1.use_future_array_shapes()
 
     assert uv == uv1