Fixing tests.

Author: bishopbm2

files/st2_task_base.py

@@ -58,15 +58,15 @@ def parse_output(self, stdout):
             print(stdout)
             # try to parse stdout as JSON and return the parse result
             return {'result': json.loads(stdout)}
-        except (ValueError, TypeError):
+        except ValueError:
             # JSON parsing failed, return the raw stdout string
             return {'result': stdout}
 
     def exec_cmd(self, cmd, error_msg):
         result = {}
         try:
             stdout = subprocess.check_output(cmd,
-                                             stderr=self.parse_output(subprocess.STDOUT),
+                                             stderr=subprocess.STDOUT,
                                              env=self.env)
             result.update(self.parse_output(stdout))
         except subprocess.CalledProcessError as e: