From 62abcd0b744d2c80ccc231fc61039e442fef70ce Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 5 May 2015 14:07:24 -0400 Subject: [PATCH 1/3] Create empty history if history is unavailable during api call --- lib/galaxy/tools/parameters/basic.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index c689005ec22a..19d89edd7975 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1657,6 +1657,8 @@ def _get_history( self, trans, history=None ): assert trans is not None, "%s requires a trans" % class_name if history is None: history = trans.get_history() + if history is None: + history = trans.get_history( create=True ) assert history is not None, "%s requires a history" % class_name return history From 9ebf6912d6f7b12148b9eb033845ed4d05e35e6d Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 5 May 2015 15:44:29 -0400 Subject: [PATCH 2/3] Remove unnecessary lines --- lib/galaxy/tools/parameters/basic.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 19d89edd7975..91dc78721187 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1655,8 +1655,6 @@ def __init__( self, tool, input_source, trans ): def _get_history( self, trans, history=None ): class_name = self.__class__.__name__ assert trans is not None, "%s requires a trans" % class_name - if history is None: - history = trans.get_history() if history is None: history = trans.get_history( create=True ) assert history is not None, "%s requires a history" % class_name From f0f2f397ff1fb75f07d44fb8beb40de32fbc9df8 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 6 May 2015 09:26:37 -0400 Subject: [PATCH 3/3] Fix test cases --- test/unit/tools/test_data_parameters.py | 2 +- test/unit/tools/test_execution.py | 2 +- test/unit/unittest_utils/galaxy_mock.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/tools/test_data_parameters.py b/test/unit/tools/test_data_parameters.py index bf005a90458e..062ace3551db 100644 --- a/test/unit/tools/test_data_parameters.py +++ b/test/unit/tools/test_data_parameters.py @@ -150,7 +150,7 @@ def setUp( self ): self.app.model.context.flush() self.trans = bunch.Bunch( app=self.app, - get_history=lambda: self.test_history, + get_history=lambda **k: self.test_history, get_current_user_roles=lambda: [], workflow_building_mode=False, webapp=bunch.Bunch( name="galaxy" ), diff --git a/test/unit/tools/test_execution.py b/test/unit/tools/test_execution.py index 25890b3fd13d..cab7989e85b6 100644 --- a/test/unit/tools/test_execution.py +++ b/test/unit/tools/test_execution.py @@ -478,7 +478,7 @@ def __init__( self, app, history ): self.webapp = Bunch( name="galaxy" ) self.sa_session = self.app.model.context - def get_history( self ): + def get_history( self, **kwargs ): return self.history diff --git a/test/unit/unittest_utils/galaxy_mock.py b/test/unit/unittest_utils/galaxy_mock.py index b06f65f61c45..128dbfde385e 100644 --- a/test/unit/unittest_utils/galaxy_mock.py +++ b/test/unit/unittest_utils/galaxy_mock.py @@ -91,7 +91,7 @@ def set_user( self, user ): user = property( get_user, set_user ) - def get_history( self ): + def get_history( self, **kwargs ): return self.history def set_history( self, history ):