Significant refactoring of run_isolated.

client/tests/run_isolated_test.py

 #!/usr/bin/env python
 # Copyright 2013 The Swarming Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0 that
 # can be found in the LICENSE file.
 
 # pylint: disable=R0201
 
 import StringIO
 import functools
 import json
@@ skipping 430 matching lines @@
         '--isolate-server', 'https://localhost:1',
         '--json', out,
     ]
     ret = run_isolated.main(cmd)
     self.assertEqual(0, ret)
     # Replace ${ISOLATED_OUTDIR} with the temporary directory.
     sub_cmd[2] = self.popen_calls[0][0][2]
     self.assertNotIn('ISOLATED_OUTDIR', sub_cmd[2])
     self.assertEqual([(sub_cmd, {'detached': True})], self.popen_calls)
     expected = {
-      u'isolated': u'e0a0fffa0910dd09e7ef4c89496116f60317e6c4',
-      u'isolatedserver': u'http://localhost:1',
-      u'namespace': u'default-gzip',
+      u'exit_code': 0,
+      u'internal_failure': None,
+      u'outputs_ref': {
+        u'isolated': u'e0a0fffa0910dd09e7ef4c89496116f60317e6c4',
+        u'isolatedserver': u'http://localhost:1',
+        u'namespace': u'default-gzip',
+      },
+      u'version': 1,
     }
     self.assertEqual(expected, tools.read_json(out))
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   unittest.main()