[NaCl SDK] Convert python scripts from optparse to argparse.

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 29 matching lines @@
     if self.process and self.process.returncode is None:
       self.process.kill()
 
   @staticmethod
   def _SubprocessThread(process, queue):
     stdout, stderr = process.communicate()
     queue.put((process.returncode, stdout, stderr))
 
   def _Run(self, args=None, timeout=None):
     args = args or []
-    run_py = os.path.join(PARENT_DIR, 'run.py')
-    cmd = [sys.executable, run_py]
+    cmd = [sys.executable, os.path.join(PARENT_DIR, 'run.py')]

[binji, 2014/11/13 23:57:05]

seems unrelated

[Sam Clegg, 2014/11/30 17:55:14]

Done.

     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():
@@ skipping 12 matching lines @@
     if http_request_type:
       args.append('--' + http_request_type)
     if sleep:
       args.extend(['--sleep', str(sleep)])
     if expect_to_be_killed:
       args.append('--expect-to-be-killed')
     return args
 
   def testQuit(self):
     args = self._GetChromeMockArgs('?quit=1', 'get', sleep=10)
-    _, stdout, _ = self._Run(args, timeout=20)
-    self.assertTrue('Starting' in stdout)
-    self.assertTrue('Expected to be killed' not in stdout)
+    rtn, stdout, _ = self._Run(args, timeout=20)
+    self.assertEqual(rtn, 0)
+    self.assertIn('Starting', stdout)
+    self.assertNotIn('Expected to be killed', stdout)
 
   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.assertTrue('Starting' in stdout)
+    self.assertIn('Starting', stdout)
 
 
 if __name__ == '__main__':
   unittest.main()