Re-reland r245404 ("If the destination directory doesn't contain the desired repo, delete it")

tests/scm_unittest.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 scm.py."""
 
 import logging
 import os
 import sys
@@ skipping 151 matching lines @@
     kwargs.setdefault('cwd', self.clone_dir)
     return scm.GIT.Capture(cmd, **kwargs)
 
   def testGetGitSvnHeadRev(self):
     if not self.enabled:
       return
     self.assertEquals(scm.GIT.GetGitSvnHeadRev(cwd=self.clone_dir), 2)
     self._capture(['reset', '--hard', 'HEAD^'])
     self.assertEquals(scm.GIT.GetGitSvnHeadRev(cwd=self.clone_dir), 1)
 
+  def testIsGitSvn(self):

[borenet, 2014/02/06 16:21:47]

This already succeeded, but there was no test.

[iannucci, 2014/02/06 23:05:11]

Neat

+    if not self.enabled:
+      return
+    # Git-svn
+    self.assertTrue(scm.GIT.IsGitSvn(checkout_root=self.clone_dir))
+    # Pure git
+    git_dir = scm.os.path.join(self.FAKE_REPOS.git_root, 'repo_1')
+    self.assertFalse(scm.GIT.IsGitSvn(checkout_root=git_dir))
+    # Pure svn
+    svn_dir = scm.os.path.join(self.FAKE_REPOS.svn_checkout, 'trunk')
+    self.assertFalse(scm.GIT.IsGitSvn(checkout_root=svn_dir))
+
   def testParseGitSvnSha1(self):
     test_sha1 = 'a5c63ce8671922e5c59c0dea49ef4f9d4a3020c9'
     expected_output = test_sha1 + '\n'
     # Cygwin git-svn 1.7.9 prints extra escape sequences when run under
     # TERM=xterm
     cygwin_output = test_sha1 + '\n\033[?1034h'
 
     self.assertEquals(scm.GIT.ParseGitSvnSha1(expected_output), test_sha1)
     self.assertEquals(scm.GIT.ParseGitSvnSha1(cygwin_output), test_sha1)
 
@@ skipping 284 matching lines @@
     # Asserting the tree is not sufficient, svn status must come out clear too.
     self.assertEquals('', self._capture(['status']))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(level=logging.DEBUG)
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: