Move GenerateDiff into a common function.

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 14 matching lines @@
     self.compareMembers(gclient_utils, members)
 
 
 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'])
     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'])
     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)
@@ skipping 88 matching lines @@
     base_url = 'svn://a/b/c/d'
     full_url = gclient_utils.FullUrlFromRelative2(base_url, '/crap')
     self.assertEqual(full_url, 'svn://a/b/c/crap')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: