make unit tests pass on the mac

tests/fake_repos.py

 #!/usr/bin/python
 # Copyright (c) 2010 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
 import logging
 import os
 import pprint
 import re
 import socket
 import subprocess
 import sys
 import tempfile
+import time
 
 # trial_dir must be first for non-system libraries.
 from tests import trial_dir
 import gclient_utils
 import scm
 
 ## Utility functions
 
 
 def kill_pid(pid):
@@ skipping 202 matching lines @@
     """Kills the servers and delete the directories."""
     self.tear_down_svn()
     self.tear_down_git()
     # This deletes the directories.
     self.trial.tear_down()
     self.trial = None
 
   def tear_down_svn(self):
     if self.svnserve:
       logging.debug('Killing svnserve pid %s' % self.svnserve.pid)
-      self.svnserve.kill()
+      try:
+        self.svnserve.kill()
+      except OSError, e:
+        if e.errno != errno.ESRCH:   # no such process
+          raise
       self.wait_for_port_to_free(self.svn_port)
       self.svnserve = None
       if not self.trial.SHOULD_LEAK:
         logging.debug('Removing %s' % self.svn_repo)
         gclient_utils.rmtree(self.svn_repo)
         logging.debug('Removing %s' % self.svn_checkout)
         gclient_utils.rmtree(self.svn_checkout)
       else:
         return False
     return True
@@ skipping 45 matching lines @@
       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)
 
+    # Mac 10.6 ships with a buggy subversion build and we need this line
+    # to work around the bug.
+    write(join(self.svn_repo, 'db', 'fsfs.conf'),
+        '[rep-sharing]\n'
+        'enable-rep-sharing = false\n')
+
     # Start the daemon.
     cmd = ['svnserve', '-d', '--foreground', '-r', self.root_dir]
     if self.host == '127.0.0.1':
       cmd.append('--listen-host=' + self.host)
     self.check_port_is_free(self.svn_port)
     self.svnserve = Popen(cmd, cwd=self.svn_repo)
     self.wait_for_port_to_bind(self.svn_port, self.svnserve)
     self.populateSvn()
     self.svn_dirty = False
     return True
@@ skipping 53 matching lines @@
       sock.connect((self.host, port))
       # It worked, throw.
       assert False, '%d shouldn\'t be bound' % port
     except EnvironmentError:
       pass
     finally:
       sock.close()
 
   def wait_for_port_to_bind(self, port, process):
     sock = socket.socket()
+
+    if sys.platform == 'darwin':
+      # On Mac SnowLeopard, if we attempt to connect to the socket
+      # immediately, it fails with EINVAL and never gets a chance to
+      # connect (putting us into a hard spin and then failing).
+      # Linux doesn't need this.
+      time.sleep(0.1)
+
     try:
       start = datetime.datetime.utcnow()
       maxdelay = datetime.timedelta(seconds=30)
       while (datetime.datetime.utcnow() - start) < maxdelay:
         try:
           sock.connect((self.host, port))
           logging.debug('%d is now bound' % port)
           return
         except EnvironmentError:
           pass
@@ skipping 338 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))