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

tests/gclient_smoketest.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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 1325 matching lines @@
         ('svn', 'trunk/other', 'src/other'),
         ('git', 'repo_2@' + self.githash('repo_2', 1)[:7], 'src/repo2'),
         ('git', 'repo_3', 'src/repo2/repo_renamed'),
         ('svn', 'trunk/third_party/foo@1', 'src/third_party/foo'),
       ]
     expected = [(scm, bases[scm] + url, os.path.join(self.root_dir, path))
                 for (scm, url, path) in expected_source]
 
     self.assertEquals(sorted(entries), sorted(expected))
 
+  def testDeleteConflictingCheckout(self):
+    if not self.enabled:
+      return
+
+    # Create an initial svn checkout.
+    self.gclient(['config', '--spec',
+        'solutions=['
+        '{"name": "src",'
+        ' "url": "' + self.svn_base + 'trunk/src"},'
+        ']'
+    ])
+    results = self.gclient(['sync', '--deps', 'mac'])
+    self.assertEqual(results[2], 0, 'Sync failed!')
+
+    # Verify that we have the expected svn checkout.
+    results = self.gclient(['revinfo', '--deps', 'mac'])
+    actual = results[0].splitlines()
+    expected = [
+      'src: %strunk/src' % self.svn_base,
+      'src/file/other: File("%strunk/other/DEPS")' % self.svn_base,
+      'src/other: %strunk/other' % self.svn_base,
+      'src/third_party/foo: %strunk/third_party/foo@1' % self.svn_base,
+    ]
+    self.assertEquals(actual, expected)
+
+    # Change the desired checkout to git.
+    self.gclient(['config', '--spec',
+        'solutions=['
+        '{"name": "src",'
+        ' "url": "' + self.git_base + 'repo_1"},'
+        ']'
+    ])
+
+    # Verify that the sync succeeds with --force.
+    results = self.gclient(['sync', '--deps', 'mac', '--force'])
+    self.assertEqual(results[2], 0, 'Sync failed!')
+
+    # Verify that we got the desired git checkout.
+    results = self.gclient(['revinfo', '--deps', 'mac'])
+    actual = results[0].splitlines()
+    expected = [
+      'src: %srepo_1' % self.git_base,
+      'src/repo2: %srepo_2@%s' % (self.git_base, self.githash('repo_2', 1)[:7]),
+      'src/repo2/repo_renamed: %srepo_3' % self.git_base,
+    ]
+    self.assertEquals(actual, expected)
+
+    # Change the desired checkout back to svn.
+    self.gclient(['config', '--spec',
+        'solutions=['
+        '{"name": "src",'
+        ' "url": "' + self.svn_base + 'trunk/src"},'
+        ']'
+    ])
+
+    # Verify that the sync succeeds.
+    results = self.gclient(['sync', '--deps', 'mac', '--force'])
+    self.assertEqual(results[2], 0, 'Sync failed!')
+
+    # Verify that we have the expected svn checkout.
+    results = self.gclient(['revinfo', '--deps', 'mac'])
+    actual = results[0].splitlines()
+    expected = [
+      'src: %strunk/src' % self.svn_base,
+      'src/file/other: File("%strunk/other/DEPS")' % self.svn_base,
+      'src/other: %strunk/other' % self.svn_base,
+      'src/third_party/foo: %strunk/third_party/foo@1' % self.svn_base,
+    ]
+    self.assertEquals(actual, expected)
+
 
 class GClientSmokeFromCheckout(GClientSmokeBase):
   # WebKit abuses this. It has a .gclient and a DEPS from a checkout.
   def setUp(self):
     super(GClientSmokeFromCheckout, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn()
     os.rmdir(self.root_dir)
     if self.enabled:
       usr, pwd = self.FAKE_REPOS.USERS[0]
       subprocess2.check_call(
@@ skipping 88 matching lines @@
 
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()