From 9e7db155d023a250cea2f795771655b0db65183a Mon Sep 17 00:00:00 2001 From: nsheff Date: Thu, 16 Feb 2017 12:56:50 -0500 Subject: [PATCH] Fix looper args bug. Fix #41 --- looper/models.py | 2 +- test_looper.py | 6 +++--- tests/pipelines/config/pipeline_interface.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/looper/models.py b/looper/models.py index 44440e17..f9090b53 100644 --- a/looper/models.py +++ b/looper/models.py @@ -1245,7 +1245,7 @@ def select_pipeline(self, pipeline_name): def uses_looper_args(self, pipeline_name): config = self.select_pipeline(pipeline_name) - if hasattr(config, "looper_args") and config.looper_args: + if config.has_key("looper_args") and config["looper_args"]: return True else: return False diff --git a/test_looper.py b/test_looper.py index 5dd7fc45..5a59d8f1 100644 --- a/test_looper.py +++ b/test_looper.py @@ -84,9 +84,9 @@ def test1(self): self.assertTrue(s3.confirm_required_inputs()) - - - + # test uses_looper_args + self.assertTrue(pi.uses_looper_args("testngs.sh")) + self.assertFalse(pi.uses_looper_args("testpipeline.sh")) diff --git a/tests/pipelines/config/pipeline_interface.yaml b/tests/pipelines/config/pipeline_interface.yaml index c218b430..5571aded 100644 --- a/tests/pipelines/config/pipeline_interface.yaml +++ b/tests/pipelines/config/pipeline_interface.yaml @@ -1,6 +1,6 @@ testpipeline.sh: name: test_pipeline # Name used by pypiper so looper can find the logs - looper_args: True + looper_args: False arguments: "--input": file optional_arguments: