Make more tests pass on Windows.

tests/presubmit_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Unit tests for presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint is too confused.
 # pylint: disable=E1101,E1103,R0201,W0212,W0403
 
@@ skipping 1988 matching lines @@
 
   def testCannedRunUnitTests(self):
     change = presubmit.Change(
         'foo1', 'description1', self.fake_root_dir, None, 0, 0)
     input_api = self.MockInputApi(change, False)
     unit_tests = ['allo', 'bar.py']
     input_api.PresubmitLocalPath().AndReturn(self.fake_root_dir)
     input_api.PresubmitLocalPath().AndReturn(self.fake_root_dir)
     input_api.subprocess.check_call(
         ['allo'], cwd=self.fake_root_dir)
+    cmd = ['bar.py']
+    if input_api.platform == 'win32':
+      cmd.insert(0, input_api.python_executable)

[Dirk Pranke, 2011/04/05 21:01:29]

why not always use cmd = [ input_api.python_executable ] ?

     input_api.subprocess.check_call(
-        ['bar.py'], cwd=self.fake_root_dir).AndRaise(
+        cmd, cwd=self.fake_root_dir).AndRaise(
             input_api.subprocess.CalledProcessError())
 
     self.mox.ReplayAll()
     results = presubmit_canned_checks.RunUnitTests(
         input_api,
         presubmit.OutputApi,
         unit_tests,
         verbose=True)
     self.assertEqual(1, len(results))
     self.assertEqual(
         presubmit.OutputApi.PresubmitPromptWarning, results[0].__class__)
     self.checkstdout('Running allo\nRunning bar.py\n')
 
   def testCannedRunUnitTestsInDirectory(self):
     change = presubmit.Change(
         'foo1', 'description1', self.fake_root_dir, None, 0, 0)
     input_api = self.MockInputApi(change, False)
     input_api.PresubmitLocalPath().AndReturn(self.fake_root_dir)
     input_api.PresubmitLocalPath().AndReturn(self.fake_root_dir)
     path = presubmit.os.path.join(self.fake_root_dir, 'random_directory')
     input_api.os_listdir(path).AndReturn(['.', '..', 'a', 'b', 'c'])
     input_api.os_path.isfile = lambda x: not x.endswith('.')
     input_api.subprocess.check_call(
-        ['random_directory/b'], cwd=self.fake_root_dir)
+        [presubmit.os.path.join('random_directory', 'b')],
+        cwd=self.fake_root_dir)
 
     self.mox.ReplayAll()
     results = presubmit_canned_checks.RunUnitTestsInDirectory(
         input_api,
         presubmit.OutputApi,
         'random_directory',
         whitelist=['^a$', '^b$'],
         blacklist=['a'],
         verbose=True)
     self.assertEqual(results, [])
-    self.checkstdout('Running random_directory/b\n')
+    self.checkstdout(
+        'Running %s\n' % presubmit.os.path.join('random_directory', 'b'))
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()