Fix unit tests for viewonly History.datasets and Workflow.parent_workflow_steps

History.datasets is now viewonly, so it queries the DB instead of
reading the in-memory collection. Flush after collect so the unflushed
HDA is visible to the query.

Workflow.parent_workflow_steps is now viewonly, so the cascade that
previously pulled the parent workflow into the session no longer fires.
Add the invocation to the session explicitly so FK columns on workflow
step connections are synced on commit.

Author: mvdbeek

test/unit/app/tools/test_collect_primary_datasets.py

@@ -197,6 +197,7 @@ def test_copied_to_imported_histories(self):
         assert len(history_2.datasets) == 1
 
         self._collect()
+        self.app.model.context.flush()
 
         # Make sure extra primary was copied to cloned history with
         # cloned output.

test/unit/workflows/test_workflow_progress.py

@@ -196,6 +196,7 @@ def test_subworkflow_progress(self):
             self.invocation.workflow.step_by_index(1)
         )
         session = self.app.model.session
+        session.add(self.invocation)
         session.add(subworkflow_invocation)
         session.commit()
         progress = self._new_workflow_progress()