Fix both gclient_scm_test.py and scm_unittest.py.

tests/scm_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for scm.py."""
 
 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)
     self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCall')
     self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCallAndFilter')
 
 
 class RootTestCase(BaseSCMTestCase):
   def testMembersChanged(self):
     self.mox.ReplayAll()
@@ skipping 299 matching lines @@
     self.mox.ReplayAll()
     info = scm.SVN.CaptureStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: