Fix both gclient_scm_test.py and scm_unittest.py.

tests/gclient_scm_test.py

Index: tests/gclient_scm_test.py
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 20a4cbdb08263a0caedb33d8ffdfb7c84c589edd..4f8b656fb124f9e0de5b6bf7919908d1c583b76b 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):