Make more tests pass on Windows.

tests/subprocess2_test.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 subprocess2.py."""
 
 import optparse
 import os
 import sys
@@ skipping 10 matching lines @@
 
 class Subprocess2Test(unittest.TestCase):
   # Can be mocked in a test.
   TO_SAVE = {
       subprocess2: ['Popen', 'call', 'check_call', 'capture', 'check_output'],
       subprocess2.subprocess: ['Popen'],
   }
 
   def setUp(self):
     self.exe_path = __file__
-    self.exe = [self.exe_path, '--child']
+    self.exe = [sys.executable, self.exe_path, '--child']
     self.saved = {}
     for module, names in self.TO_SAVE.iteritems():
       self.saved[module] = dict(
           (name, getattr(module, name)) for name in names)
 
   def tearDown(self):
     for module, saved in self.saved.iteritems():
       for name, value in saved.iteritems():
         setattr(module, name, value)
 
@@ skipping 52 matching lines @@
     expected = {
         'args': ['foo'],
         'a': True,
     }
     self.assertEquals(expected, results)
 
   def test_Popen_defaults(self):
     results = self._fake_subprocess_Popen()
     proc = subprocess2.Popen(['foo'], a=True)
     self.assertEquals(-8, proc.returncode)
-    env = os.environ.copy()
-    env['LANG'] = 'en_US.UTF-8'
     expected = {
         'args': ['foo'],
         'a': True,
         'shell': bool(sys.platform=='win32'),
-        'env': env,
     }
+    if sys.platform != 'win32':
+      env = os.environ.copy()
+      is_english = lambda name: env.get(name, 'en').startswith('en')
+      if not is_english('LANG'):
+        env['LANG'] = 'en_US.UTF-8'
+        expected['env'] = env
+      if not is_english('LANGUAGE'):
+        env['LANGUAGE'] = 'en_US.UTF-8'
+        expected['env'] = env
     self.assertEquals(expected, results)
 
   def test_check_output_defaults(self):
     results = self._fake_call()
     # It's discarding 'stderr' because it assumes stderr=subprocess2.STDOUT but
     # fake_call() doesn't 'implement' that.
     self.assertEquals('stdout', subprocess2.check_output(['foo'], a=True))
     expected = {
         'args': ['foo'],
         'a':True,
@@ skipping 11 matching lines @@
     self.assertEquals(-9, returncode)
     self.assertEquals(['', None], out)
 
   def test_void(self):
     out = subprocess2.check_output(
          self.exe + ['--stdout', '--stderr'],
          stdout=subprocess2.VOID)
     self.assertEquals(None, out)
     out = subprocess2.check_output(
          self.exe + ['--stdout', '--stderr'],
+          universal_newlines=True,
          stderr=subprocess2.VOID)
     self.assertEquals('A\nBB\nCCC\n', out)
 
   def test_check_output_throw(self):
     try:
-      subprocess2.check_output(self.exe + ['--fail', '--stderr'])
+      subprocess2.check_output(
+          self.exe + ['--fail', '--stderr'], universal_newlines=True)
       self.fail()
     except subprocess2.CalledProcessError, e:
       self.assertEquals('a\nbb\nccc\n', e.stdout)
       self.assertEquals(None, e.stderr)
       self.assertEquals(64, e.returncode)
 
   def test_check_call_throw(self):
     try:
       subprocess2.check_call(self.exe + ['--fail', '--stderr'])
       self.fail()
@@ skipping 29 matching lines @@
   do('CCC')
   if options.sleep:
     time.sleep(10)
   return options.return_value
 
 
 if __name__ == '__main__':
   if len(sys.argv) > 1 and sys.argv[1] == '--child':
     sys.exit(child_main(sys.argv[2:]))
   unittest.main()