commit fae707be998a04450417780fd4dd31516d5922ea
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Sep 15 18:57:58 2011 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Sep 15 18:57:58 2011 +0000
tree 6dd8f16bced0a92cc4a8f19dba380a06b2599768
parent adcf5b702d482b3fc4faf095be804cf955182f2d

Fix a typo that resulted in no tests to be run in depot_tools. :(

Add a warning when RunUnitTestsInDirectory() finds no test to run to
catch this kind of regression.

Fix all the regressions that where introduced in the meantime...

TBR=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@101347 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 4a16a79..2ea01fd 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -21,6 +21,7 @@
 import logging
 import sys
 import gclient_scm
+import subprocess2
 
 # Shortcut since this function is used often
 join = gclient_scm.os.path.join
@@ -40,19 +41,19 @@
 class BaseTestCase(GCBaseTestCase, SuperMoxTestBase):
   def setUp(self):
     SuperMoxTestBase.setUp(self)
-    self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCall')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils,
         'CheckCallAndFilterAndHeader')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite')
-    self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'Popen')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'RemoveDirectory')
     self._CaptureSVNInfo = gclient_scm.scm.SVN.CaptureInfo
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureStatus')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'RunAndGetFileList')
+    self.mox.StubOutWithMock(subprocess2, 'communicate')
+    self.mox.StubOutWithMock(subprocess2, 'Popen')
     self._scm_wrapper = gclient_scm.CreateSCM
     gclient_scm.scm.SVN.current_version = None
     # Absolute path of the fake checkout directory.
@@ -757,7 +758,7 @@
     try:
       scm.update(options, (), [])
       self.fail()
-    except gclient_scm.gclient_utils.Error:
+    except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError):
       # The exact exception text varies across git versions so it's not worth
       # verifying it. It's fine as long as it throws.
       pass