From 246503440a12414372dd74a1ca8ac12531122793 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Mon, 30 Sep 2013 22:29:10 -0400 Subject: [PATCH] Fix for broken task-related tests. --- awx/main/tasks.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 011b301e31..e9ea8cd5df 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -278,9 +278,7 @@ class RunJob(BaseTask): ''' credential = getattr(job, 'credential', None) if credential: - return decrypt_field(credential, 'ssh_key_data') - else: - return '' + return decrypt_field(credential, 'ssh_key_data') or None def build_passwords(self, job, **kwargs): ''' @@ -453,7 +451,7 @@ class RunProjectUpdate(BaseTask): Return SSH private key data needed for this project update. ''' project = project_update.project - return decrypt_field(project, 'scm_key_data') + return decrypt_field(project, 'scm_key_data') or None def build_passwords(self, project_update, **kwargs): '''