From 96913eb60f904495051f460ce7d366816297117c Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Tue, 1 Jun 2010 16:22:47 +0000 Subject: [PATCH] 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 --- tests/gclient_scm_test.py | 12 +++++++++++- tests/scm_unittest.py | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py index 20a4cbdb0..4f8b656fb 100755 --- a/tests/gclient_scm_test.py +++ b/tests/gclient_scm_test.py @@ -16,7 +16,17 @@ import __builtin__ 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): diff --git a/tests/scm_unittest.py b/tests/scm_unittest.py index d4270bd1d..d2acc04b9 100755 --- a/tests/scm_unittest.py +++ b/tests/scm_unittest.py @@ -9,12 +9,22 @@ from shutil import rmtree import tempfile # Fixes include path. -from super_mox import mox, SuperMoxBaseTestBase +from super_mox import mox, SuperMoxBaseTestBase, SuperMoxTestBase -from gclient_test import BaseTestCase import scm +class BaseTestCase(SuperMoxTestBase): + # Like unittest's assertRaises, but checks for Gclient.Error. + def assertRaisesError(self, msg, fn, *args, **kwargs): + try: + fn(*args, **kwargs) + except scm.gclient_utils.Error, e: + self.assertEquals(e.args[0], msg) + else: + self.fail('%s not raised' % msg) + + class BaseSCMTestCase(BaseTestCase): def setUp(self): BaseTestCase.setUp(self)