opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clear the cache before fetching a file from irods object store, to verify file is fetched from the object store, not from the cache

Browse Source
This commit is contained in:
Kaivan Kamali
2022-01-13 15:19:10 -05:00
parent 7cd6c2b15d
commit 85ade3df4f
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/objectstore/test_objectstore_datatype_upload.py
+1 -1
View File
@@ -183,7 +183,7 @@ def test_upload_datatype_dos_disk_and_disk(distributed_instance, test_data, temp
@pytest.mark.parametrize('test_data', TEST_CASES.values(), ids=list(TEST_CASES.keys()))
def test_upload_datatype_irods(irods_instance, test_data, temp_file):
upload_datatype_helper(irods_instance, test_data, temp_file)
upload_datatype_helper(irods_instance, test_data, temp_file, True)
@pytest.mark.parametrize('test_data', TEST_CASES.values(), ids=list(TEST_CASES.keys()))
test/integration/test_datatype_upload.py
+10 -1
View File
@@ -1,5 +1,6 @@
import collections
import os
import shutil
import pytest
@@ -59,7 +60,7 @@ def test_upload_datatype_auto(instance, test_data, temp_file):
upload_datatype_helper(instance, test_data, temp_file)
def upload_datatype_helper(instance, test_data, temp_file):
def upload_datatype_helper(instance, test_data, temp_file, delete_cache_dir=False):
is_compressed = False
for is_method in (is_bz2, is_gzip, is_zip):
is_compressed = is_method(test_data.path)
@@ -93,6 +94,14 @@ def upload_datatype_helper(instance, test_data, temp_file):
datatype = registry.datatypes_by_extension[file_ext]
datatype_compressed = getattr(datatype, "compressed", False)
if not is_compressed or datatype_compressed:
if delete_cache_dir:
# Delete cache directory and then re-create it. This way we confirm
# that dataset is fetched from the object store, not from the cache
temp_dir = instance.get_object_store_kwargs()['temp_directory']
cache_dir = temp_dir + '/object_store_cache'
shutil.rmtree(cache_dir)
os.mkdir(cache_dir)
# download file and verify it hasn't been manipulated
temp_file.write(instance.dataset_populator.get_history_dataset_content(history_id=instance.history_id,
dataset=dataset,