Fix gclient_smoketest for svn 1.5 and python 2.5

tests/fake_repos.py

Index: tests/fake_repos.py
diff --git a/tests/fake_repos.py b/tests/fake_repos.py
index 126041dcc8db74928aa2dc96ebe1fc8ddb19ae71..fa2b493164abd02e6b4c41f6ad21b8ba0915184b 100755
--- a/tests/fake_repos.py
+++ b/tests/fake_repos.py
@@ -25,16 +25,16 @@ 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):
@@ -175,17 +175,21 @@ def commit_svn(repo):
   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)
@@ -315,7 +319,6 @@ class FakeRepos(object):
     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()