commit d8b4121c2867c60af03c0129c4b14696c646ad55 Author: juga0 <juga> Date: Wed Dec 23 16:51:35 2015 +0000

changed report structure for ProcessTest --- ooni/templates/process.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ooni/templates/process.py b/ooni/templates/process.py index 7ec4b2e..b7dafdd 100644 --- a/ooni/templates/process.py +++ b/ooni/templates/process.py @@ -103,12 +103,10 @@ class ProcessTest(NetTestCase):

def processEnded(self, result, command): log.debug("Finished %s: %s" % (command, result)) - key = ' '.join(command) - self.report[key] = { - 'stdout': result['stdout'], - 'stderr': result['stderr'], - 'exit_reason': result['exit_reason'] - } + self.report['command_name'] = ' '.join(command) + self.report['command_stdout'] = result['stdout'] + self.report['command_stderr'] = result['stderr'] + self.report['command_exit_reason'] = result['exit_reason'] return result

def run(self, command, finished=None, env={}, path=None, usePTY=0):