Unverified Commit c3738ad9 authored by Björn Grüning's avatar Björn Grüning Committed by GitHub
Browse files

Merge pull request #18653 from mvdbeek/dont_set_file_size_to_zero 

[24.0] Don't set file size to zero
parents f6c8c636 847ac059

lib/galaxy/model/__init__.py

+0 −2
Original line number Diff line number Diff line
@@ -4211,8 +4211,6 @@ class Dataset(Base, StorableObject, Serializable): 
        # TODO: purge metadata files

        self.deleted = True

        self.purged = True

        self.file_size = 0

        self.total_size = 0



    def get_access_roles(self, security_agent):

        roles = []

lib/galaxy_test/api/test_datasets.py

+13 −0
Original line number Diff line number Diff line
@@ -658,6 +658,19 @@ class TestDatasetsApi(ApiTestCase): 
        deleted_job_details = self.dataset_populator.get_job_details(job_id).json()

        assert deleted_job_details["state"] in ("deleting", "deleted"), deleted_job_details



    def test_purge_does_not_reset_file_size(self):

        with self.dataset_populator.test_history() as history_id:

            dataset = self.dataset_populator.new_dataset(history_id=history_id, content="ABC", wait=True)

            assert dataset["file_size"]

            self.dataset_populator.delete_dataset(

                history_id=history_id, content_id=dataset["id"], purge=True, wait_for_purge=True

            )

            purged_dataset = self.dataset_populator.get_history_dataset_details(

                history_id=history_id, content_id=dataset["id"]

            )

            assert purged_dataset["purged"]

            assert dataset["file_size"] == purged_dataset["file_size"]



    def test_delete_batch(self):

        num_datasets = 4

        dataset_map: Dict[int, str] = {}