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.
 """
 
 import logging
 import os
 import re
+import socket
 import subprocess
 import sys
 import unittest
 
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, ROOT_DIR)
 
 from testing_support.fake_repos import join, write
 from testing_support.fake_repos import FakeReposTestBase, FakeRepoTransitive
 
@@ skipping 743 matching lines @@
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     cmd = ['sync', '--jobs', '1', '--delete_unversioned_trees', '--reset']
     self.assertEquals(0, self.gclient(cmd)[-1])
     third_party = join(self.root_dir, 'src', 'third_party')
     subprocess2.check_call(['svn', 'propset', '-q', 'svn:ignore', 'foo', '.'],
                            cwd=third_party)
 
     # Cripple src/third_party/foo and make sure gclient still succeeds.
     gclient_utils.rmtree(join(third_party, 'foo', '.svn'))
-    self.assertEquals(0, self.gclient(cmd)[-1])
+    self.assertEquals(0, self.gclient(cmd + ['--force'])[-1])
 
 
 class GClientSmokeSVNTransitive(GClientSmokeBase):
   FAKE_REPOS_CLASS = FakeRepoTransitive
 
   def setUp(self):
     super(GClientSmokeSVNTransitive, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn()
 
   def testSyncTransitive(self):
@@ skipping 306 matching lines @@
 
     # Pre-DEPS hooks don't run with runhooks.
     self.gclient(['runhooks', '--deps', 'mac'])
     tree = self.mangle_git_tree(('repo_5@2', 'src'),
                                 ('repo_1@2', 'src/repo1'),
                                 ('repo_2@1', 'src/repo2')
                                 )
     self.assertTree(tree)
 
     # Pre-DEPS hooks run when syncing with --nohooks.
-    self.gclient(['sync', '--deps', 'mac', '--nohooks',
+    self.gclient(['sync', '--deps', 'mac', '--nohooks', '--force',
                   '--revision', 'src@' + self.githash('repo_5', 2)])
     tree = self.mangle_git_tree(('repo_5@2', 'src'),
                                 ('repo_1@2', 'src/repo1'),
                                 ('repo_2@1', 'src/repo2')
                                 )
     tree['src/git_pre_deps_hooked'] = 'git_pre_deps_hooked'
     self.assertTree(tree)
 
     os.remove(join(self.root_dir, 'src', 'git_pre_deps_hooked'))
 
     # Pre-DEPS hooks don't run with --noprehooks
-    self.gclient(['sync', '--deps', 'mac', '--noprehooks',
+    self.gclient(['sync', '--deps', 'mac', '--noprehooks', '--force',
                   '--revision', 'src@' + self.githash('repo_5', 2)])
     tree = self.mangle_git_tree(('repo_5@2', 'src'),
                                 ('repo_1@2', 'src/repo1'),
                                 ('repo_2@1', 'src/repo2')
                                 )
     self.assertTree(tree)
 
   def testPreDepsHooksError(self):
     if not self.enabled:
       return
@@ skipping 207 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))
 
+  # TODO(borenet): Enable this at the same time that the guard is removed in
+  # gclient.
+  if (os.environ.get('CHROME_HEADLESS') and
+      socket.gethostname() in ('vm859-m1', 'build1-m1', 'vm630-m1')):

[borenet, 2014/01/14 21:49:45]

This is very, very stupid, but since there's a guard in gclient, we can't run
this test and expect it to have reasonable results until the guard is gone.

[iannucci, 2014/01/14 22:40:02]

What about mocking socket.gethostname to return 'vm859-m1' for the duration of
this test?

[M-A Ruel, 2014/01/14 22:46:09]

Mock enable_deletion_of_conflicting_checkouts instead.

[borenet, 2014/01/15 13:53:27]

These are much better solutions.  Unfortunately, since we shell out to gclient
rather than importing it directly, I can't mock anything directly.  The best I
could do is play with environment variables.  I could modify
enable_deletion_of_conflicting_checkouts to be something like this:

return os.environ.get('FORCE_ENABLE_GCLIENT_AUTODELETE') or
(os.environ.get('CHROME_HEADLESS') and socket......)

And then stuff FORCE_ENABLE_GCLIENT_AUTODELETE into the environment for the
duration of the test, but that seems even more hacky.  I almost prefer the
current solution for its simplicity.

+    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]),

[M-A Ruel, 2014/01/14 22:46:09]

80 cols

+        '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()