Unverified Commit ff95e7e1 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #19891 from mvdbeek/fix_has_data_check_in_metadata_script_on_pulsar 

[24.2] Fix tabular metadata setting on pulsar with remote metadata
parents ecc4b478 3c12acb2

lib/galaxy/jobs/__init__.py

+1 −0
Original line number Diff line number Diff line
@@ -1758,6 +1758,7 @@ class MinimalJobWrapper(HasResourceParameters): 
            self.change_state(model.Job.states.QUEUED, flush=False, job=job)

        elif not self.queue_with_limit(job, self.job_destination):

            return False

        job.update_output_states(self.app.application_stack.supports_skip_locked())

        # Set object store after job destination so can leverage parameters...

        self._set_object_store_ids(job)

        # Now that we have the object store id, check if we are over the limit

test/functional/tools/metadata_column_names.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
            <param name="input" value="2.tabular" />

            <output name="output">

                <metadata name="column_names" value="First,2.tabular"/>

                <metadata name="column_types" value="int,int,float"/>

            </output>

            <output_collection name="paired_output" type="paired">

                <element name="forward" ftype="tabular" value="2.tabular">

test/integration/test_pulsar_embedded.py

+1 −0
Original line number Diff line number Diff line
@@ -41,5 +41,6 @@ test_tools = integration_util.integration_tool_runner( 
        "composite_output_tests",

        "detect_errors",

        "tool_directory_copy",

        "metadata_columns",

    ]

)