updates tests

Author: Mikejmnez

xarray/tests/test_backends.py

@@ -6563,8 +6563,7 @@ def test_session(self) -> None:
 @requires_pydap
 @network
 @pytest.mark.parametrize("protocol", ["dap2", "dap4"])
-@pytest.mark.parametrize("batch", [False, True])
-def test_batchdap4_downloads(tmpdir, protocol, batch) -> None:
+def test_batchdap4_downloads(tmpdir, protocol) -> None:
     """Test that in dap4, all dimensions are downloaded at once"""
     import pydap
     from pydap.net import create_session
@@ -6576,39 +6575,28 @@ def test_batchdap4_downloads(tmpdir, protocol, batch) -> None:
     session.cache.clear()
     url = "https://test.opendap.org/opendap/hyrax/data/nc/coads_climatology.nc"
 
+    ds = open_dataset(
+        url.replace("https", protocol),
+        session=session,
+        engine="pydap",
+        decode_times=False,
+    )
+
     if protocol == "dap4":
-        ds = open_dataset(
-            url.replace("https", protocol),
-            engine="pydap",
-            session=session,
-            decode_times=False,
-            batch=batch,
-        )
         if _version_ > Version("3.5.5"):
             # total downloads are:
-            # 1 dmr + 1 dap (dimensions)
+            # 1 dmr + 1 dap (all dimensions at once)
             assert len(session.cache.urls()) == 2
             # now load the rest of the variables
             ds.load()
-            if batch:
-                # all non-dimensions are downloaded in a single https requests
-                assert len(session.cache.urls()) == 2 + 1
-            if not batch:
-                # each non-dimension array is downloaded with an individual
-                # https requests
-                assert len(session.cache.urls()) == 2 + 4
+            # each non-dimension array is downloaded with an individual https requests
+            assert len(session.cache.urls()) == 2 + 4
         else:
             assert len(session.cache.urls()) == 4
             ds.load()
             assert len(session.cache.urls()) == 4 + 4
     elif protocol == "dap2":
-        ds = open_dataset(
-            url.replace("https", protocol),
-            engine="pydap",
-            session=session,
-            decode_times=False,
-        )
-        # das + dds + 3 dods urls
+        # das + dds + 3 dods urls for dimensions alone
         assert len(session.cache.urls()) == 5