Add more python 2.5 compatibility.

tests/fake_repos.py

-#!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+#!/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
 import logging
 import os
@@ skipping 167 matching lines @@
     time.sleep(0.1)
 
   try:
     start = datetime.datetime.utcnow()
     maxdelay = datetime.timedelta(seconds=30)
     while (datetime.datetime.utcnow() - start) < maxdelay:
       try:
         sock.connect((host, port))
         logging.debug('%d is now bound' % port)
         return
-      except EnvironmentError:
+      except (socket.error, EnvironmentError):
         pass
       logging.debug('%d is still not bound' % port)
   finally:
     sock.close()
   # The process failed to bind. Kill it and dump its ouput.
   process.kill()
   logging.error('%s' % process.communicate()[0])
   assert False, '%d is still not bound' % port
 
 
 def wait_for_port_to_free(host, port):
   start = datetime.datetime.utcnow()
   maxdelay = datetime.timedelta(seconds=30)
   while (datetime.datetime.utcnow() - start) < maxdelay:
     try:
       sock = socket.socket()
       sock.connect((host, port))
       logging.debug('%d was bound, waiting to free' % port)
-    except EnvironmentError:
+    except (socket.error, EnvironmentError):
       logging.debug('%d now free' % port)
       return
     finally:
       sock.close()
   assert False, '%d is still bound' % port
 
 
 _FAKE_LOADED = False
 
 class FakeReposBase(object):
@@ skipping 137 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:
       check_call(['svnadmin', 'create', self.svn_repo])
-    except OSError:
+    except OSError, e:
+      logging.debug('Failed with : %s' % e)
       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.
     self.svn_port = find_free_port(self.host, 10000)
+    logging.debug('Using port %d' % self.svn_port)
     cmd = ['svnserve', '-d', '--foreground', '-r', self.root_dir,
         '--listen-port=%d' % self.svn_port]
     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)
     wait_for_port_to_bind(self.host, self.svn_port, self.svnserve)
     self.svn_base = 'svn://%s:%d/svn/' % (self.host, self.svn_port)
     self.populateSvn()
     self.svn_dirty = False
@@ skipping 49 matching lines @@
     else:
       new_tree = tree.copy()
     self.git_hashes[repo].append((commit_hash, new_tree))
 
   def check_port_is_free(self, port):
     sock = socket.socket()
     try:
       sock.connect((self.host, port))
       # It worked, throw.
       assert False, '%d shouldn\'t be bound' % port
-    except EnvironmentError:
+    except (socket.error, EnvironmentError):
       pass
     finally:
       sock.close()
 
   def populateSvn(self):
     raise NotImplementedError()
 
   def populateGit(self):
     raise NotImplementedError()
 
@@ skipping 309 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))