From eb42d130d34c9393f3386ba115de6fe561e9ef18 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 16 Feb 2017 13:18:25 -0500 Subject: [PATCH] Fix unit tests for that last commit. --- test/unit/tools/test_data_parameters.py | 2 +- test/unit/tools/test_execution.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/tools/test_data_parameters.py b/test/unit/tools/test_data_parameters.py index 4f652afbd56..a14436da2e6 100644 --- a/test/unit/tools/test_data_parameters.py +++ b/test/unit/tools/test_data_parameters.py @@ -163,7 +163,7 @@ class DataToolParameterTestCase( BaseParameterTestCase ): self._param = None def stub_active_datasets( self, *hdas ): - self.test_history._active_datasets_children_and_roles = [ h for h in hdas if not h.deleted ] + self.test_history._active_datasets_and_roles = [ h for h in hdas if not h.deleted ] def _simple_field( self, **kwds ): return self.param.to_dict( trans=self.trans, **kwds ) diff --git a/test/unit/tools/test_execution.py b/test/unit/tools/test_execution.py index 441308ec090..a71f6a8f168 100644 --- a/test/unit/tools/test_execution.py +++ b/test/unit/tools/test_execution.py @@ -199,7 +199,7 @@ class MockTrans( object ): self.app = app self.history = history self.user = None - self.history._active_datasets_children_and_roles = [hda for hda in self.app.model.context.model_objects[ galaxy.model.HistoryDatasetAssociation ] if hda.active and hda.history == history] + self.history._active_datasets_and_roles = [hda for hda in self.app.model.context.model_objects[ galaxy.model.HistoryDatasetAssociation ] if hda.active and hda.history == history] self.workflow_building_mode = False self.webapp = Bunch( name="galaxy" ) self.sa_session = self.app.model.context