Get test_webkitpy to actually run again.

sky/tools/webkitpy/common/checkout/diff_parser_unittest.py

 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 75 matching lines @@
             "\n",
             " - Cool Hacker\n",
             "\n",
             ]
 
         revision_lines = [
             "Subversion Revision 289799\n",
             ]
 
         svn_diff_lines = [
-            "Index: Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
+            "Index: tools/webkitpy/common/checkout/diff_parser.py\n",
             "===================================================================\n",
-            "--- Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
-            "+++ Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
+            "--- tools/webkitpy/common/checkout/diff_parser.py\n",
+            "+++ tools/webkitpy/common/checkout/diff_parser.py\n",
             "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n",
             ]
         self.assertEqual(diff_parser.get_diff_converter(svn_diff_lines), diff_parser.svn_diff_to_svn_diff)
         self.assertEqual(diff_parser.get_diff_converter(comment_lines + svn_diff_lines), diff_parser.svn_diff_to_svn_diff)
         self.assertEqual(diff_parser.get_diff_converter(revision_lines + svn_diff_lines), diff_parser.svn_diff_to_svn_diff)
 
         git_diff_lines = [
-            "diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
+            "diff --git a/tools/webkitpy/common/checkout/diff_parser.py b/tools/webkitpy/common/checkout/diff_parser.py\n",
             "index 3c5b45b..0197ead 100644\n",
-            "--- a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
-            "+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
+            "--- a/tools/webkitpy/common/checkout/diff_parser.py\n",
+            "+++ b/tools/webkitpy/common/checkout/diff_parser.py\n",
             "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n",
             ]
         self.assertEqual(diff_parser.get_diff_converter(git_diff_lines), diff_parser.git_diff_to_svn_diff)
         self.assertEqual(diff_parser.get_diff_converter(comment_lines + git_diff_lines), diff_parser.git_diff_to_svn_diff)
         self.assertEqual(diff_parser.get_diff_converter(revision_lines + git_diff_lines), diff_parser.git_diff_to_svn_diff)
 
     def test_git_mnemonicprefix(self):
         p = re.compile(r' ([a|b])/')
 
         prefixes = [
             { 'a' : 'i', 'b' : 'w' }, # git-diff (compares the (i)ndex and the (w)ork tree)
             { 'a' : 'c', 'b' : 'w' }, # git-diff HEAD (compares a (c)ommit and the (w)ork tree)
             { 'a' : 'c', 'b' : 'i' }, # git diff --cached (compares a (c)ommit and the (i)ndex)
             { 'a' : 'o', 'b' : 'w' }, # git-diff HEAD:file1 file2 (compares an (o)bject and a (w)ork tree entity)
             { 'a' : '1', 'b' : '2' }, # git diff --no-index a b (compares two non-git things (1) and (2))
         ]
 
         for prefix in prefixes:
             patch = p.sub(lambda x: " %s/" % prefix[x.group(1)], DIFF_TEST_DATA)
             self.test_diff_parser(diff_parser.DiffParser(patch.splitlines()))
 
     def test_git_diff_to_svn_diff(self):
         output = """\
-Index: Tools/Scripts/webkitpy/common/checkout/diff_parser.py
+Index: tools/webkitpy/common/checkout/diff_parser.py
 ===================================================================
---- Tools/Scripts/webkitpy/common/checkout/diff_parser.py
-+++ Tools/Scripts/webkitpy/common/checkout/diff_parser.py
+--- tools/webkitpy/common/checkout/diff_parser.py
++++ tools/webkitpy/common/checkout/diff_parser.py
 @@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):
  A
  B
  C
 +D
  E
  F
 """
 
         inputfmt = StringIO.StringIO("""\
-diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
+diff --git a/tools/webkitpy/common/checkout/diff_parser.py b/tools/webkitpy/common/checkout/diff_parser.py
 index 2ed552c4555db72df16b212547f2c125ae301a04..72870482000c0dba64ce4300ed782c03ee79b74f 100644
---- a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
-+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
+--- a/tools/webkitpy/common/checkout/diff_parser.py
++++ b/tools/webkitpy/common/checkout/diff_parser.py
 @@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):
  A
  B
  C
 +D
  E
  F
 """)
         shortfmt = StringIO.StringIO("""\
-diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
+diff --git a/tools/webkitpy/common/checkout/diff_parser.py b/tools/webkitpy/common/checkout/diff_parser.py
 index b48b162..f300960 100644
---- a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
-+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py
+--- a/tools/webkitpy/common/checkout/diff_parser.py
++++ b/tools/webkitpy/common/checkout/diff_parser.py
 @@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):
  A
  B
  C
 +D
  E
  F
 """)
 
         self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_diff(x) for x in shortfmt.readlines()))
         self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_diff(x) for x in inputfmt.readlines()))