Fix gclient_smoketest for svn 1.5 and python 2.5

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 errno
 import logging
 import os
 import pprint
 import re
 import stat
 import subprocess
 import sys
 import time
 import unittest
 
 
 ## Utility functions
 
 
 def addKill():
   """Add kill() method to subprocess.Popen for python <2.6"""
   if getattr(subprocess.Popen, 'kill', None):
     return
-  if sys.platform.startswith('win'):
+  if sys.platform == 'win32':
     def kill_win(process):
       import win32process
       return win32process.TerminateProcess(process._handle, -1)
-    subprocess.kill = kill_win
+    subprocess.Popen.kill = kill_win
   else:
     def kill_nix(process):
       import signal
       return os.kill(process.pid, signal.SIGKILL)
-    subprocess.kill = kill_nix
+    subprocess.Popen.kill = kill_nix
 
 
 def rmtree(*path):
   """Recursively removes a directory, even if it's marked read-only.
 
   Remove the directory located at *path, if it exists.
 
   shutil.rmtree() doesn't work on Windows if any of the files or directories
   are read-only, which svn repositories and some .svn files are.  We need to
   be able to force the files to be writable (i.e., deletable) as we traverse
@@ skipping 120 matching lines @@
 
 
 def commit_svn(repo):
   """Commits the changes and returns the new revision number."""
   # Basic parsing.
   to_add = []
   to_remove = []
   for item in Popen(['svn', 'status'],
                     cwd=repo).communicate()[0].splitlines(False):
     if item[0] == '?':
-      to_add.append(item[8:])
+      to_add.append(item[7:].strip())

[Mandeep Singh Baines, 2010/06/02 01:33:01]

This seems fragile. How about:

item.split()[1]

The downside with that is that you don't quoted strings properly but that should
be OK. None of the test code uses that.

     elif item[0] == '!':
-      to_remove.append(item[8:])
+      to_remove.append(item[7:].strip())
   if to_add:
     check_call(['svn', 'add', '--no-auto-props', '-q'] + to_add, cwd=repo)
   if to_remove:
     check_call(['svn', 'remove', '-q'] + to_remove, cwd=repo)
-  out = Popen(['svn', 'commit', repo, '-m', 'foo', '--non-interactive',
+  proc = Popen(['svn', 'commit', repo, '-m', 'foo', '--non-interactive',
                 '--no-auth-cache', '--username', 'user1', '--password', 'foo'],
-              cwd=repo).communicate()[0]
-  rev = re.search(r'revision (\d+).', out).group(1)
+               cwd=repo)
+  out, err = proc.communicate()
+  match = re.search(r'revision (\d+).', out)
+  if not match:
+    raise Exception('Commit failed', out, err, proc.returncode)
+  rev = match.group(1)
   st = Popen(['svn', 'status'], cwd=repo).communicate()[0]
   assert len(st) == 0, st
   logging.debug('At revision %s' % rev)
   return rev
 
 
 def commit_git(repo):
   """Commits the changes and returns the new hash."""
   check_call(['git', 'add', '-A', '-f'], cwd=repo)
   check_call(['git', 'commit', '-q', '--message', 'foo'], cwd=repo)
@@ skipping 109 matching lines @@
         'password-db = passwd\n')
     write(join(root, 'conf', 'passwd'),
         '[users]\n'
         'user1 = foo\n'
         'user2 = bar\n')
 
     # Start the daemon.
     cmd = ['svnserve', '-d', '--foreground', '-r', self.repos_dir]
     if self.HOST == '127.0.0.1':
       cmd.append('--listen-host=127.0.0.1')
-    logging.debug(cmd)
     self.svnserve = Popen(cmd, cwd=root)
     self.populateSvn()
 
   def populateSvn(self):
     """Creates a few revisions of changes including DEPS files."""
     # Repos
     check_call(['svn', 'checkout', 'svn://127.0.0.1/svn', self.svn_root, '-q',
                 '--non-interactive', '--no-auth-cache',
                 '--username', 'user1', '--password', 'foo'])
     assert os.path.isdir(join(self.svn_root, '.svn'))
@@ skipping 248 matching lines @@
     fake.setUp()
     print('Fake setup, press enter to quit or Ctrl-C to keep the checkouts.')
     sys.stdin.readline()
   except KeyboardInterrupt:
     fake.SHOULD_LEAK = True
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))