commit 051c88b9c0c2977a5a99ca199033c95ed5ba242e
author dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Dec 22 00:23:03 2011 +0000
committer dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Dec 22 00:23:03 2011 +0000
tree be62b7e9d115b6fe096d52c86b81b2c6427a3c8b
parent d79d41954e45ae40436a48e67b5c16249f1a2fb4

[depot_tools] Disabling new git checkouts with safesync_urls until fixed.

R=maruel@chromium.org
TEST=gclient sync a freshly configured client.
BUG=106015


Review URL: http://codereview.chromium.org/8994016

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@115452 0039d316-1c4b-4281-b951-d872f2087c98

tests/gclient_scm_test.py

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index ac13c10..41f4281 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -1004,13 +1004,13 @@
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True)
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1
         ).AndReturn(True)
-    gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev='1'
-        ).AndReturn(False)
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
     gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes(
         ).AndReturn(False)
 
+    gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True)
+
     self.mox.ReplayAll()
 
     git_scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
@@ -1019,7 +1019,7 @@
     # the LKGR gets flipped to git sha1's some day).
     self.assertEquals(git_scm.GetUsableRev(self.fake_hash_1, options),
                       self.fake_hash_1)
-    # An SVN rev with a purely git repo should raise an exception.
+    # An SVN rev with an existing purely git repo should raise an exception.
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       git_scm.GetUsableRev, '1', options)
 
@@ -1054,10 +1054,16 @@
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=too_big
         ).AndReturn(False)
 
+    gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
+    gclient_scm.os.path.isdir(self.base_path).MultipleTimes().AndReturn(True)
+
     self.mox.ReplayAll()
 
     git_svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                                     relpath=self.relpath)
+    # Without an existing checkout, this should fail. TODO(dbeam) Fix this.
+    self.assertRaises(gclient_scm.gclient_utils.Error,
+                      git_svn_scm.GetUsableRev, '1', options)
     # Given an SVN revision with a git-svn checkout, it should be translated to
     # a git sha1 and be usable.
     self.assertEquals(git_svn_scm.GetUsableRev('1', options),