Commit e1804900 authored Dec 07, 2022 by davelopez

Skip this commit when merging forward

This is just to make the test compatible with 22.05 since there is no "rocrate.zip" model store format yet.

parent 2e819528

lib/galaxy/schema/schema.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -1293,7 +1293,7 @@ class ModelStoreFormat(str, Enum):

		@classmethod
		def is_compressed(cls, value: "ModelStoreFormat"):
		return value in [cls.TAR_DOT_GZ, cls.TGZ, cls.TAR, cls.ROCRATE_ZIP]
		return value in [cls.TAR_DOT_GZ, cls.TGZ, cls.TAR]

		@classmethod
		def is_bag(cls, value: "ModelStoreFormat"):

test/integration/test_history_import_export.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ class ImportExportHistoryViaTasksIntegrationTestCase(
		self.dataset_populator.new_dataset(
		history_id, content=open(self.test_data_resolver.get_filename("1.bam"), "rb"), file_type="bam", wait=True
		)
		model_store_format = "rocrate.zip"
		model_store_format = "tgz" # Change to "rocrate.zip" when merging this forward and remove this comment, thanks!
		target_uri = f"gxfiles://posix_test/history.{model_store_format}"

		self.dataset_populator.export_history_to_uri_async(history_id, target_uri, model_store_format)
		@@ -106,7 +106,7 @@ class ImportExportHistoryViaTasksIntegrationTestCase(
		history_name = f"for_export_ftp_async_{uuid4()}"
		history_id = self.dataset_populator.setup_history_for_export_testing(history_name)

		model_store_format = "rocrate.zip"
		model_store_format = "tgz" # Change to "rocrate.zip" when merging this forward and remove this comment, thanks!
		target_uri = f"gxftp://history.{model_store_format}"

		self.dataset_populator.export_history_to_uri_async(history_id, target_uri, model_store_format)