Fix both gclient_scm_test.py and scm_unittest.py.
Review URL: http://codereview.chromium.org/2425003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48637 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 20a4cbd..4f8b656 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -16,7 +16,17 @@
from super_mox import mox, SuperMoxBaseTestBase, SuperMoxTestBase
import gclient_scm
-from gclient_test import BaseTestCase as GCBaseTestCase
+
+
+class GCBaseTestCase(SuperMoxTestBase):
+ # Like unittest's assertRaises, but checks for Gclient.Error.
+ def assertRaisesError(self, msg, fn, *args, **kwargs):
+ try:
+ fn(*args, **kwargs)
+ except gclient_scm.gclient_utils.Error, e:
+ self.assertEquals(e.args[0], msg)
+ else:
+ self.fail('%s not raised' % msg)
class BaseTestCase(GCBaseTestCase):