Change CheckCall behavior when print_error=False

tests/gclient_utils_test.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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 re
 import StringIO
 
 import gclient_utils
 from super_mox import SuperMoxTestBase
@@ skipping 17 matching lines @@
 class CheckCallTestCase(SuperMoxTestBase):
   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'])
+    process.communicate().AndReturn(['bleh', 'foo'])
     self.mox.ReplayAll()
     gclient_utils.CheckCall(command)
 
   def testCheckCallFailure(self):
     command = ['boo', 'foo', 'bar']
     process = self.mox.CreateMockAnything()
     process.returncode = 42
     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'])
+    process.communicate().AndReturn(['bleh', 'foo'])
     self.mox.ReplayAll()
     try:
       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):
   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):
@@ skipping 64 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: