Make more tests pass on Windows.

tests/fake_repos.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.
 
 """Generate fake repositories for testing."""
 
 import atexit
 import datetime
 import errno
@@ skipping 292 matching lines @@
       else:
         write(join(root, k), v)
 
   def set_up_svn(self):
     """Creates subversion repositories and start the servers."""
     self.set_up()
     if self.svnserve:
       return True
     try:
       subprocess2.check_call(['svnadmin', 'create', self.svn_repo])
-    except subprocess2.CalledProcessError, e:
-      logging.debug('Failed with : %s' % e)
+    except (OSError, subprocess2.CalledProcessError):
       return False
     write(join(self.svn_repo, 'conf', 'svnserve.conf'),
         '[general]\n'
         'anon-access = read\n'
         'auth-access = write\n'
         'password-db = passwd\n')
     text = '[users]\n'
     text += ''.join('%s = %s\n' % (usr, pwd) for usr, pwd in self.USERS)
     write(join(self.svn_repo, 'conf', 'passwd'), text)
 
@@ skipping 20 matching lines @@
     self.svn_base = 'svn://%s:%d/svn/' % (self.host, self.svn_port)
     self.populateSvn()
     self.svn_dirty = False
     return True
 
   def set_up_git(self):
     """Creates git repositories and start the servers."""
     self.set_up()
     if self.gitdaemon:
       return True
-    if sys.platform == 'win32':
+    assert self.git_pid_file == None
+    try:
+      subprocess2.check_output(['git', '--version'])
+    except (OSError, subprocess2.CalledProcessError):
       return False
-    assert self.git_pid_file == None
     for repo in ['repo_%d' % r for r in range(1, self.NB_GIT_REPOS + 1)]:
       subprocess2.check_call(['git', 'init', '-q', join(self.git_root, repo)])
       self.git_hashes[repo] = [None]
     self.git_port = find_free_port(self.host, 20000)
     self.git_base = 'git://%s:%d/git/' % (self.host, self.git_port)
     # Start the daemon.
     self.git_pid_file = tempfile.NamedTemporaryFile()
     cmd = ['git', 'daemon',
         '--export-all',
         '--reuseaddr',
@@ skipping 364 matching lines @@
     fake.set_up_git()
     print('Fake setup, press enter to quit or Ctrl-C to keep the checkouts.')
     sys.stdin.readline()
   except KeyboardInterrupt:
     trial_dir.TrialDir.SHOULD_LEAK.leak = True
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))