If the destination directory doesn't contain the desired repo, delete it

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Unit tests for gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 84 matching lines @@
 
   def setUp(self):
     BaseTestCase.setUp(self)
     self.url = self.SvnUrl()
 
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
         'GetCheckoutRoot',
+        'GetRemoteURL',
         'GetRevisionDate',
         'GetUsableRev',
         'Svnversion',
         'RunCommand',
         'cleanup',
         'diff',
         'name',
         'pack',
         'relpath',
         'revert',
@@ skipping 570 matching lines @@
 
     self.mox.ReplayAll()
 
     svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir)
     # With an SVN checkout, 1 an example of a valid usable rev.
     self.assertEquals(svn_scm.GetUsableRev(1, options), 1)
     # With an SVN checkout, a fake or unknown rev should raise an excpetion.
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       svn_scm.GetUsableRev, 'fake', options)
 
+  def testGetRemoteURL(self):
+    options = self.Options(verbose=True)
+    svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+
+    if svn_scm.relpath:
+      cwd = os.path.join(svn_scm._root_dir, svn_scm.relpath)
+    else:
+      cwd = svn_scm._root_dir
+
+    gclient_scm.scm.SVN.Capture(['info', os.curdir], cwd).AndReturn(
+"""
+Path: .
+URL: %s
+Repository Root: https://dummy.repo.com/svn
+Repository UUID: FAKE
+Revision: 1234
+Node Kind: directory
+Schedule: normal
+Last Changed Author: fakedev@chromium.org
+Last Changed Rev: 1234
+Last Changed Date: 2013-11-11 15:12:34 -0500 (Mon, 11 Nov 2013)
+""" % svn_scm.url)
+
+    self.mox.ReplayAll()
+
+    self.assertEquals(svn_scm.GetRemoteURL(options), self.url)
+
+
 class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils,
                              unittest.TestCase):
   """This class doesn't use pymox."""
   class OptionsObject(object):
     def __init__(self, verbose=False, revision=None):
       self.verbose = verbose
       self.revision = revision
       self.manually_grab_svn_rev = True
       self.deps_os = None
       self.force = False
@@ skipping 101 matching lines @@
     rmtree(self.root_dir)
     gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists
     gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists
 
 class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
         'GetCheckoutRoot',
+        'GetRemoteURL',
         'GetRevisionDate',
         'GetUsableRev',
         'RunCommand',
         'cache_dir',
         'cache_locks',
         'cleanup',
         'diff',
         'name',
         'pack',
         'UpdateSubmoduleConfig',
@@ skipping 347 matching lines @@
     self.assertEquals(git_svn_scm.GetUsableRev('3', options),
                       self.fake_hash_2)
     # Given a git sha1 with a git-svn checkout, it should be used as is.
     self.assertEquals(git_svn_scm.GetUsableRev(self.fake_hash_1, options),
                       self.fake_hash_1)
     # We currently check for seemingly valid SVN revisions by assuming 6 digit
     # numbers, so assure that numeric revs >= 1000000 don't work.
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       git_svn_scm.GetUsableRev, too_big, options)
 
+  def testGetRemoteURL(self):
+    options = self.Options(verbose=True)
+    self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Capture', True)
+    git_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+    git_scm._Capture(['remote', '-v']).AndReturn(
+"""
+origin  %s (fetch)
+origin  %s (push)

[iannucci, 2013/11/13 06:26:30]

nit: you could do %(url)s in the string and then supply {'url': git_scm.url} as
the interpolation argument to be a bit more concise/clear

Also, I'm generally uneasy with gclient's obsession with the maintained remote
being 'origin'. But that's not your fault :)

[borenet, 2013/11/13 19:12:24]

Done. I'll leave the "origin" --> REMOTE_NAME refactoring for a future change.

+""" % (git_scm.url, git_scm.url))
+
+    self.mox.ReplayAll()
+
+    self.assertEquals(git_scm.GetRemoteURL(options), self.url)
+
 
 class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase):
   def testUpdateUpdate(self):
     if not self.enabled:
       return
     options = self.Options()
     expected_file_list = []
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     options.revision = 'unmanaged'
     scm.update(options, (), file_list)
     self.assertEquals(file_list, expected_file_list)
     self.assertEquals(scm.revinfo(options, (), None),
                       '069c602044c5388d2d15c3f875b057c852003458')
     self.checkstdout('________ unmanaged solution; skipping .\n')
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: