Don't delete directories that have been superseded by a broader checkout.

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 @@
     return self.OptionsObject(*args, **kwargs)
 
   def setUp(self):
     BaseTestCase.setUp(self)
     self.url = self.SvnUrl()
 
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
+        'GetCheckoutRoot',
         'GetRevisionDate',
         'GetUsableRev',
         'RunCommand',
         'cleanup',
         'diff',
         'nag_max',
         'nag_timer',
         'pack',
         'relpath',
         'revert',
@@ skipping 667 matching lines @@
     unittest.TestCase.tearDown(self)
     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',
         'GetRevisionDate',
         'GetUsableRev',
         'RunCommand',
         'cleanup',
         'diff',
         'nag_max',
         'nag_timer',
         'pack',
         'UpdateSubmoduleConfig',
         'relpath',
@@ skipping 388 matching lines @@
 
 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: