Merge pull request galaxyproject#16493 from mvdbeek/update_cache_tests

Test that object store cache file gets updated

test/integration/objectstore/_base.py

@@ -57,8 +57,14 @@ def setUp(self):
         self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
 
 
+def get_files(directory):
+    for rel_directory, _, files in os.walk(directory):
+        for file_ in files:
+            yield os.path.join(rel_directory, file_)
+
+
 def files_count(directory):
-    return sum(len(files) for _, _, files in os.walk(directory))
+    return sum(1 for _ in get_files(directory))
 
 
 @integration_util.skip_unless_docker()
@@ -85,7 +91,7 @@ def handle_galaxy_config_kwds(cls, config):
         config_path = os.path.join(temp_directory, "object_store_conf.xml")
         config["object_store_store_by"] = "uuid"
         config["metadata_strategy"] = "extended"
-        config["outpus_to_working_dir"] = True
+        config["outputs_to_working_directory"] = True
         config["retry_metadata_internally"] = False
         with open(config_path, "w") as f:
             f.write(

test/integration/objectstore/test_objectstore_datatype_upload.py

@@ -126,7 +126,7 @@ def handle_galaxy_config_kwds(cls, config):
         cls.object_stores_parent = temp_directory
         cls.object_store_config_path = os.path.join(temp_directory, "object_store_conf.xml")
         config["metadata_strategy"] = "extended"
-        config["outpus_to_working_dir"] = True
+        config["outputs_to_working_directory"] = True
         config["retry_metadata_internally"] = False
         config["object_store_store_by"] = "uuid"
         with open(cls.object_store_config_path, "w") as f:

test/integration/objectstore/test_remote_objectstore_cache_operations.py

@@ -6,6 +6,7 @@
 from ._base import (
     BaseSwiftObjectStoreIntegrationTestCase,
     files_count,
+    get_files,
 )
 
 
@@ -71,3 +72,9 @@ def test_delete_item_not_in_cache(self):
                 hda["history_id"], content_id=hda["id"], wait=False, assert_ok=False
             )
             assert "File Not Found" in str(excinfo.value)
+
+    def test_upload_updates_cache(self):
+        self.upload_dataset()
+        assert files_count(self.object_store_cache_path) == 1
+        only_file = next(iter(get_files(self.object_store_cache_path)))
+        assert os.path.getsize(only_file) == 4

test/integration/test_extended_metadata_outputs_to_working_directory.py

@@ -8,13 +8,13 @@
 
 
 class ExtendedMetadataOutputsToWorkingDirIntegrationInstance(ExtendedMetadataIntegrationInstance):
-    """Describe a Galaxy test instance with metadata_strategy set to extended and outputs_to_working_dir set."""
+    """Describe a Galaxy test instance with metadata_strategy set to extended and outputs_to_working_directory set."""
 
     @classmethod
     def handle_galaxy_config_kwds(cls, config):
         config["metadata_strategy"] = "extended"
         config["object_store_store_by"] = "uuid"
-        config["outpus_to_working_dir"] = True
+        config["outputs_to_working_directory"] = True
         config["retry_metadata_internally"] = False