blargal

tes/apiendpoints.py

@@ -206,10 +206,14 @@ def wrap_execute(sess, host, user, cmd, bastion=None,stdin=None, sshport="22", b
             return apiabort(400, message=res['stderr'].decode())
 
         try:
-            data = json.loads(res['stdout'].decode())
-            return data
+            if res['stdout'].decode() != '':
+                data = json.loads(res['stdout'].decode())
+                return data
+            else:
+                return None
         except json.decoder.JSONDecodeError:
-            return apiabort(500, data = {'stdout':res['stdout'],'stderr':res['stderr']})
+            return None
+            #return apiabort(500, data = {'stdout':res['stdout'].decode(),'stderr':res['stderr'].decode()})
         except Exception as e:
             import traceback
             logger.error(e)