Commit 838c19cd authored by davelopez's avatar davelopez
Browse files

Do not force all datasets as discarded on import by default

parent 844af82c

lib/galaxy/managers/model_stores.py

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ class ModelStoreManager: 


    def import_model_store(self, request: ImportModelStoreTaskRequest):

        import_options = ImportOptions(

            discarded_data=ImportDiscardedDataType.FORCE,

            allow_library_creation=request.for_library,

        )

        history_id = request.history_id

test/integration/test_history_import_export.py

+5 −1
Original line number Diff line number Diff line
@@ -74,7 +74,11 @@ class ImportExportHistoryViaTasksIntegrationTestCase( 
        assert imported_history["name"] == history_name

        history_contents = self.dataset_populator.get_history_contents(imported_history_id)

        assert len(history_contents) == 2

        # Only deleted datasets should appear as "discarded"

        for dataset in history_contents:

            if dataset["deleted"] is True:

                assert dataset["state"] == "discarded"

            else:

                assert dataset["state"] == "ok"