Fix gclient_utils_test and disable gclient_scm_test.

tests/gclient_utils_test.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.
 
 import StringIO
 
 # Fixes include path.
 from super_mox import SuperMoxTestBase
 
 import gclient_utils
 
 
-class GclientUtilsUnittest(SuperMoxTestBase):
+class GclientUtilBase(SuperMoxTestBase):
+  def setUp(self):
+    super(GclientUtilBase, self).setUp()
+    gclient_utils.sys.stdout.flush = lambda: None
+
+
+class GclientUtilsUnittest(GclientUtilBase):
   """General gclient_utils.py tests."""
   def testMembersChanged(self):
     members = [
         'CheckCall', 'CheckCallError', 'Error', 'ExecutionQueue', 'FileRead',
         'FileWrite', 'FindFileUpwards', 'FindGclientRoot',
         'GetGClientRootAndEntries', 'GetNamedNodeText',
         'GetNodeNamedAttributeText', 'PathDifference', 'ParseXML',
         'PrintableObject', 'RemoveDirectory', 'SplitUrlRevision',
         'SubprocessCall', 'SubprocessCallAndFilter', 'SyntaxErrorToError',
         'WorkItem',
         'errno', 'logging', 'os', 're', 'stat', 'subprocess', 'sys',
         'threading', 'time', 'xml',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gclient_utils, members)
 
 
-class CheckCallTestCase(SuperMoxTestBase):
+class CheckCallTestCase(GclientUtilBase):
   def testCheckCallSuccess(self):
     command = ['boo', 'foo', 'bar']
     process = self.mox.CreateMockAnything()
     process.returncode = 0
     gclient_utils.subprocess.Popen(
         command, cwd=None,
         stderr=None,
         stdout=gclient_utils.subprocess.PIPE,
         shell=gclient_utils.sys.platform.startswith('win')).AndReturn(process)
     process.communicate().AndReturn(['bleh', 'foo'])
@@ skipping 15 matching lines @@
       gclient_utils.CheckCall(command)
       self.fail()
     except gclient_utils.CheckCallError, e:
       self.assertEqual(e.command, command)
       self.assertEqual(e.cwd, None)
       self.assertEqual(e.retcode, 42)
       self.assertEqual(e.stdout, 'bleh')
       self.assertEqual(e.stderr, 'foo')
 
 
-class SubprocessCallAndFilterTestCase(SuperMoxTestBase):
+class SubprocessCallAndFilterTestCase(GclientUtilBase):
   def testSubprocessCallAndFilter(self):
     command = ['boo', 'foo', 'bar']
     in_directory = 'bleh'
     fail_status = None
     pattern = 'a(.*)b'
     test_string = 'ahah\naccb\nallo\naddb\n'
     class Mock(object):
       stdout = StringIO.StringIO(test_string)
       def wait(self):
         pass
@@ skipping 16 matching lines @@
       if match:
         capture_list.append(match.group(1))
     gclient_utils.SubprocessCallAndFilter(
         command, in_directory,
         True, True,
         fail_status, FilterLines)
     self.assertEquals(line_list, ['ahah', 'accb', 'allo', 'addb'])
     self.assertEquals(capture_list, ['cc', 'dd'])
 
 
-class SplitUrlRevisionTestCase(SuperMoxTestBase):
+class SplitUrlRevisionTestCase(GclientUtilBase):
   def testSSHUrl(self):
     url = "ssh://test@example.com/test.git"
     rev = "ac345e52dc"
     out_url, out_rev = gclient_utils.SplitUrlRevision(url)
     self.assertEquals(out_rev, None)
     self.assertEquals(out_url, url)
     out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
     self.assertEquals(out_rev, rev)
     self.assertEquals(out_url, url)
     url = "ssh://example.com/test.git"
@@ skipping 24 matching lines @@
     out_url, out_rev = gclient_utils.SplitUrlRevision("%s@%s" % (url, rev))
     self.assertEquals(out_rev, rev)
     self.assertEquals(out_url, url)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: