[NaCl SDK] Store python coverage output data in 'out' directory

native_client_sdk/src/tools/tests/httpd_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import Queue
 import sys
 import subprocess
 import threading
@@ skipping 45 matching lines @@
     cmd = [sys.executable, os.path.join(TOOLS_DIR, 'run.py'), '--port=5555']
     cmd.extend(args)
     self.process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                     stderr=subprocess.PIPE)
     queue = Queue.Queue()
     thread = threading.Thread(target=RunTest._SubprocessThread,
                               args=(self.process, queue))
     thread.daemon = True
     thread.start()
     thread.join(timeout)
-    if not thread.is_alive():
-      returncode, stdout, stderr = queue.get(False)
-      return returncode, stdout, stderr
+    self.assertFalse(thread.is_alive(), "Thread still running after timeout")
 
-    return -1, None, None
+    returncode, stdout, stderr = queue.get(False)
+    return returncode, stdout, stderr
 
-  def _GetChromeMockArgs(self, page, http_request_type, sleep,
+
+  @staticmethod
+  def _GetChromeMockArgs(page, http_request_type, sleep,
                          expect_to_be_killed=True):
     args = []
     if page:
       args.extend(['-P', page])
     args.append('--')
     args.extend([sys.executable, os.path.join(SCRIPT_DIR, 'chrome_mock.py')])
     if http_request_type:
       args.append('--' + http_request_type)
     if sleep:
       args.extend(['--sleep', str(sleep)])
@@ skipping 11 matching lines @@
   def testSubprocessDies(self):
     args = self._GetChromeMockArgs(page=None, http_request_type=None, sleep=0,
                                    expect_to_be_killed=False)
     returncode, stdout, _ = self._Run(args, timeout=10)
     self.assertNotEqual(-1, returncode)
     self.assertIn('Starting', stdout)
 
 
 if __name__ == '__main__':
   unittest.main()