Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Unified Diff: sky/tools/webkitpy/common/checkout/diff_parser_unittest.py

Issue 639883003: Get test_webkitpy to actually run again. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/tools/webkitpy/common/checkout/scm/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/webkitpy/common/checkout/diff_parser_unittest.py
diff --git a/sky/tools/webkitpy/common/checkout/diff_parser_unittest.py b/sky/tools/webkitpy/common/checkout/diff_parser_unittest.py
index 660ed320aa35c91f9dde42da0bd59f88a2457f7f..475aa244c884242e6b458519dad0e976718312b0 100644
--- a/sky/tools/webkitpy/common/checkout/diff_parser_unittest.py
+++ b/sky/tools/webkitpy/common/checkout/diff_parser_unittest.py
@@ -93,10 +93,10 @@ class DiffParserTest(unittest.TestCase):
]
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)
@@ -104,10 +104,10 @@ class DiffParserTest(unittest.TestCase):
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)
@@ -131,10 +131,10 @@ class DiffParserTest(unittest.TestCase):
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
@@ -145,10 +145,10 @@ Index: Tools/Scripts/webkitpy/common/checkout/diff_parser.py
"""
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
@@ -158,10 +158,10 @@ index 2ed552c4555db72df16b212547f2c125ae301a04..72870482000c0dba64ce4300ed782c03
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
« no previous file with comments | « no previous file | sky/tools/webkitpy/common/checkout/scm/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698