small tweaks to future proof tests

Author: bhazelton

tests/test_simsetup.py

@@ -1915,6 +1915,10 @@ def test_beamlist_init(rename_beamfits, pass_beam_type, tmp_path):
         beam_file = beamfits_file
         telconfig["beam_paths"][0] = {"filename": beam_file, "file_type": "beamfits"}
 
+    # always do this once we require pyuvdata >= 3.2
+    if hasattr(Telescope(), "mount_type"):
+        telconfig["beam_paths"][0]["mount_type"] = "fixed"
+
     telconfig["beam_paths"][6]["filename"] = os.path.join(
         UV_DATA_PATH, "mwa_full_EE_test.h5"
     )
@@ -1930,10 +1934,6 @@ def test_beamlist_init(rename_beamfits, pass_beam_type, tmp_path):
         "error in version 1.6"
     ] * entries_warnings
 
-    # always do this once we require pyuvdata >= 3.2
-    if hasattr(Telescope(), "mount_type"):
-        warn_list.append("The mount_type parameter must be set for UVBeam objects")
-
     warn_types = DeprecationWarning
 
     Nfreqs = 10

tests/test_uvsim.py

@@ -43,7 +43,11 @@
 
 def multi_beams():
     beam0 = UVBeam()
-    beam0.read_beamfits(herabeam_default)
+    # always do this once we require pyuvdata >= 3.2
+    if hasattr(UVData().telescope, "mount_type"):
+        beam0.read(herabeam_default, mount_type="fixed")
+    else:
+        beam0.read(herabeam_default)
     beam0.extra_keywords["beam_path"] = herabeam_default
     beam0.peak_normalize()