Merge branch '18842-arv-mount-disk-config' refs #18842

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --combined sdk/python/tests/test_collections.py
index 24e0f41d99da90016f569e743e3b5b3eb108a197,8aded823bde3410a68dfa0e1110e0d0537d6c868..8986cf225840054bc5cd4161f7edd0b2c3f58b32
--- 1/sdk/python/tests/test_collections.py
--- 2/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@@ -16,11 -16,13 +16,13 @@@ import datetim
  import ciso8601
  import time
  import unittest
+ import parameterized
  
  from . import run_test_server
  from arvados._ranges import Range, LocatorAndRange
  from arvados.collection import Collection, CollectionReader
  from . import arvados_testutil as tutil
+ from .arvados_testutil import make_block_cache
  
  class TestResumableWriter(arvados.ResumableCollectionWriter):
      KEEP_BLOCK_SIZE = 1024  # PUT to Keep every 1K.
@@@ -28,9 -30,10 +30,10 @@@
      def current_state(self):
          return self.dump_state(copy.deepcopy)
  
- 
+ @parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}])
  class ArvadosCollectionsTest(run_test_server.TestCaseWithServers,
                               tutil.ArvadosBaseTestCase):
+     disk_cache = False
      MAIN_SERVER = {}
  
      @classmethod
@@@ -40,7 -43,8 +43,8 @@@
          run_test_server.authorize_with('admin')
          cls.api_client = arvados.api('v1')
          cls.keep_client = arvados.KeepClient(api_client=cls.api_client,
-                                              local_store=cls.local_store)
+                                              local_store=cls.local_store,
+                                              block_cache=make_block_cache(cls.disk_cache))
  
      def write_foo_bar_baz(self):
          cw = arvados.CollectionWriter(self.api_client)
@@@ -896,7 -900,7 +900,7 @@@ class NewCollectionTestCase(unittest.Te
          c1.save_new()
          loc = c1.manifest_locator()
          c2 = Collection(loc)
 -        self.assertEqual(c1.manifest_text, c2.manifest_text)
 +        self.assertEqual(c1.manifest_text(strip=True), c2.manifest_text(strip=True))
          self.assertEqual(c1.replication_desired, c2.replication_desired)
  
      def test_replication_desired_not_loaded_if_provided(self):
@@@ -905,7 -909,7 +909,7 @@@
          c1.save_new()
          loc = c1.manifest_locator()
          c2 = Collection(loc, replication_desired=2)
 -        self.assertEqual(c1.manifest_text, c2.manifest_text)
 +        self.assertEqual(c1.manifest_text(strip=True), c2.manifest_text(strip=True))
          self.assertNotEqual(c1.replication_desired, c2.replication_desired)
  
      def test_storage_classes_desired_kept_on_load(self):
@@@ -914,7 -918,7 +918,7 @@@
          c1.save_new()
          loc = c1.manifest_locator()
          c2 = Collection(loc)
 -        self.assertEqual(c1.manifest_text, c2.manifest_text)
 +        self.assertEqual(c1.manifest_text(strip=True), c2.manifest_text(strip=True))
          self.assertEqual(c1.storage_classes_desired(), c2.storage_classes_desired())
  
      def test_storage_classes_change_after_save(self):
@@@ -927,7 -931,7 +931,7 @@@
          c2.save(storage_classes=['highIO'])
          self.assertEqual(['highIO'], c2.storage_classes_desired())
          c3 = Collection(loc)
 -        self.assertEqual(c1.manifest_text, c3.manifest_text)
 +        self.assertEqual(c1.manifest_text(strip=True), c3.manifest_text(strip=True))
          self.assertEqual(['highIO'], c3.storage_classes_desired())
  
      def test_storage_classes_desired_not_loaded_if_provided(self):
@@@ -936,7 -940,7 +940,7 @@@
          c1.save_new()
          loc = c1.manifest_locator()
          c2 = Collection(loc, storage_classes_desired=['default'])
 -        self.assertEqual(c1.manifest_text, c2.manifest_text)
 +        self.assertEqual(c1.manifest_text(strip=True), c2.manifest_text(strip=True))
          self.assertNotEqual(c1.storage_classes_desired(), c2.storage_classes_desired())
  
      def test_init_manifest(self):