commit 8a13970ea21b65c57be360c35d09996bd332259c
author szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 20 15:55:01 2014 +0000
committer szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 20 15:55:01 2014 +0000
tree a62f9e025194c93d280ef02f07a5faf9ec4c2d8d
parent 108eced497e797eac2cfbcdb3b5c8026af8efa0c

Remove hooks until Windows performance issues are sorted.

R=iannucci@chromium.org,hinoka@chromium.org
BUG=

Review URL: https://codereview.chromium.org/348703002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@278717 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 55bc9c3..e91b48c 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -1322,6 +1322,8 @@
   def testUpdateNoDotGit(self):
     options = self.Options()
 
+    gclient_scm.os.path.isdir(
+        os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.exists(os.path.join(self.base_path, '.git')
@@ -1350,6 +1352,8 @@
   def testUpdateConflict(self):
     options = self.Options()
 
+    gclient_scm.os.path.isdir(
+        os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.exists(os.path.join(self.base_path, '.git')