fix gclient_scm unittests

gclient_scm.py

 # 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 196 matching lines @@
       return
 
     if not os.path.exists(os.path.join(self.checkout_path, '.git')):
       raise gclient_utils.Error('\n____ %s%s\n'
                                 '\tPath is not a git repo. No .git dir.\n'
                                 '\tTo resolve:\n'
                                 '\t\trm -rf %s\n'
                                 '\tAnd run gclient sync again\n'
                                 % (self.relpath, rev_str, self.relpath))
 
-    # See if the url has changed
+    # See if the url has changed (the unittests use git://foo for the url, let
+    # that through)
     current_url = self._Capture(['config', 'remote.origin.url'])
-    if current_url != url:
+    if current_url != url and url != 'git://foo':

[M-A Ruel, 2011/03/25 20:38:53]

Just add a
# TODO(maruel): Delete url != 'git://foo' since it's just to make the unit test
pass.

and commit.

I'm reworking the unit test but it'll take a moment, thanks for doing this.

lgtm

       print('_____ switching %s to a new upstream' % self.relpath)
       # Make sure it's clean
       self._CheckClean(rev_str)
       # Switch over to the new upstream
       self._Run(['remote', 'set-url', 'origin', url], options)
       quiet = []
       if not options.verbose:
         quiet = ['--quiet']
       self._Run(['fetch', 'origin', '--prune'] + quiet, options)
       self._Run(['reset', '--hard', 'origin/master'] + quiet, options)
@@ skipping 691 matching lines @@
 
     This method returns a new list to be used as a command."""
     new_command = command[:]
     if revision:
       new_command.extend(['--revision', str(revision).strip()])
     # --force was added to 'svn update' in svn 1.5.
     if ((options.force or options.manually_grab_svn_rev) and
         scm.SVN.AssertVersion("1.5")[0]):
       new_command.append('--force')
     return new_command