From d6f89d862ec56888b6a5ab51afbbdb0d66f3e2c8 Mon Sep 17 00:00:00 2001 From: "thomasvl@chromium.org" Date: Fri, 25 Mar 2011 20:41:58 +0000 Subject: [PATCH] Let the unittest avoid the upstream change. Review URL: http://codereview.chromium.org/6696080 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@79452 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient_scm.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gclient_scm.py b/gclient_scm.py index bd4eb731e..38656431a 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -214,9 +214,12 @@ class GitWrapper(SCMWrapper): '\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: + # TODO(maruel): Delete url != 'git://foo' since it's just to make the + # unit test pass. (and update the comment above) + if current_url != url and url != 'git://foo': print('_____ switching %s to a new upstream' % self.relpath) # Make sure it's clean self._CheckClean(rev_str)