Share more data between checkout_test and patches_data.

tests/patch_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 patch.py."""
 
 import logging
 import os
 import sys
@@ skipping 95 matching lines @@
     self.assertEquals(RAW.MINIMAL_NEW, p.get())
 
   def testValidSvnDelete(self):
     p = patch.FilePatchDiff('chrome/file.cc', RAW.MINIMAL_DELETE, [])
     self.assertEquals(RAW.MINIMAL_DELETE, p.diff_header)
     self.assertEquals('', p.diff_hunks)
     self.assertEquals(RAW.MINIMAL_DELETE, p.get())
 
   def testRelPath(self):
     patches = patch.PatchSet([
+        patch.FilePatchDiff('pp', GIT.COPY, []),
+        patch.FilePatchDiff(
+            'chromeos\\views/webui_menu_widget.h', GIT.RENAME_PARTIAL, []),
+        patch.FilePatchDiff('tools/run_local_server.sh', GIT.RENAME, []),
+        patch.FilePatchBinary('bar', 'data', [], is_new=False),
         patch.FilePatchDiff('chrome/file.cc', RAW.PATCH, []),
+        patch.FilePatchDiff('foo', GIT.NEW, []),
+        patch.FilePatchDelete('other/place/foo', True),
         patch.FilePatchDiff(
             'tools\\clang_check/README.chromium', GIT.DELETE, []),
-        patch.FilePatchDiff('tools/run_local_server.sh', GIT.RENAME, []),
-        patch.FilePatchDiff(
-            'chromeos\\views/webui_menu_widget.h', GIT.RENAME_PARTIAL, []),
-        patch.FilePatchDiff('pp', GIT.COPY, []),
-        patch.FilePatchDiff('foo', GIT.NEW, []),
-        patch.FilePatchDelete('other/place/foo', True),
-        patch.FilePatchBinary('bar', 'data', [], is_new=False),
     ])
     expected = [
-        'chrome/file.cc', 'tools/clang_check/README.chromium',
+        'pp',
+        'chromeos/views/webui_menu_widget.h',
         'tools/run_local_server.sh',
-        'chromeos/views/webui_menu_widget.h', 'pp', 'foo',
-        'other/place/foo', 'bar']
+        'bar',
+        'chrome/file.cc',
+        'foo',
+        'other/place/foo',
+        'tools/clang_check/README.chromium',
+    ]
     self.assertEquals(expected, patches.filenames)
-    orig_name = patches.patches[0].filename
-    orig_source_name = patches.patches[0].source_filename or orig_name
+
+    # Test patch #4.
+    orig_name = patches.patches[4].filename
+    orig_source_name = patches.patches[4].source_filename or orig_name
     patches.set_relpath(os.path.join('a', 'bb'))
     expected = [os.path.join('a', 'bb', x) for x in expected]
     self.assertEquals(expected, patches.filenames)
     # Make sure each header is updated accordingly.
     header = []
     new_name = os.path.join('a', 'bb', orig_name)
     new_source_name = os.path.join('a', 'bb', orig_source_name)
     for line in RAW.PATCH.splitlines(True):
       if line.startswith('@@'):
         break
       if line[:3] == '---':
         line = line.replace(orig_source_name, new_source_name)
       if line[:3] == '+++':
         line = line.replace(orig_name, new_name)
       header.append(line)
     header = ''.join(header)
-    self.assertEquals(header, patches.patches[0].diff_header)
+    self.assertEquals(header, patches.patches[4].diff_header)
 
   def testRelPathEmpty(self):
     patches = patch.PatchSet([
         patch.FilePatchDiff('chrome\\file.cc', RAW.PATCH, []),
         patch.FilePatchDelete('other\\place\\foo', True),
     ])
     patches.set_relpath('')
     self.assertEquals(
         ['chrome/file.cc', 'other/place/foo'],
         [f.filename for f in patches])
@@ skipping 232 matching lines @@
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=
       [logging.WARNING, logging.INFO, logging.DEBUG][
         min(2, sys.argv.count('-v'))])
   unittest.main()