Changeset 92632 in webkit

Timestamp:

Aug 8, 2011 2:04:31 PM (13 years ago)

Author:

abarth@webkit.org

Message:

Fix SCM webkitpy unit test failures
​https://bugs.webkit.org/show_bug.cgi?id=65823

Patch by Jochen Eisinger <​jochen@chromium.org> on 2011-08-08
Reviewed by Eric Seidel.

• Scripts/webkitpy/common/checkout/scm/git.py:
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/git.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-08  Jochen Eisinger  <jochen@chromium.org>
+
+        Fix SCM webkitpy unit test failures
+        https://bugs.webkit.org/show_bug.cgi?id=65823
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/webkitpy/common/checkout/scm/git.py:
+        * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+
 2011-08-08  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py

@@ -203 +203 @@
 
     def revisions_changing_file(self, path, limit=5):
+        # raise a script error if path does not exists to match the behavior of  the svn implementation.
+        if not self._filesystem.exists(path):
+            raise ScriptError(message="Path %s does not exist." % path)
+
         # git rev-list head --remove-empty --limit=5 -- path would be equivalent.
         commit_ids = self.run(["git", "log", "--remove-empty", "--pretty=format:%H", "-%s" % limit, "--", path]).splitlines()

trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

@@ -559 +559 @@
 @@ -1,5 +1,13 @@
  2009-10-26  Eric Seidel  <eric@webkit.org>
-
+%(whitespace)s
 +        Reviewed by NOBODY (OOPS!).
 +
@@ -569 +569 @@
 +
          Reviewed by Foo Bar.
-
+%(whitespace)s
          Most awesome change ever.
-"""
+""" % {'whitespace': ' '}
         one_line_overlap_entry = """DATE_HERE  Eric Seidel  <eric@webkit.org>
 
@@ -585 +585 @@
 +++ ChangeLog   (working copy)
 @@ -2,6 +2,14 @@
-
+%(whitespace)s
          Reviewed by Foo Bar.
-
+%(whitespace)s
 +        Second most awesome change ever.
 +
@@ -597 +597 @@
 +
          Most awesome change ever.
-
+%(whitespace)s
          * scm_unittest.py:
-"""
+""" % {'whitespace': ' '}
         two_line_overlap_entry = """DATE_HERE  Eric Seidel  <eric@webkit.org>
 
@@ -947 +947 @@
         write_into_file_at_path('test_file_commit1', 'contents')
         run_command(['git', 'add', 'test_file_commit1'])
-        scm = detect_scm_system(self.untracking_checkout_path)
+        scm = self.tracking_scm
         scm.commit_locally_with_message('message')
 
@@ -1512 +1512 @@
     def test_create_patch(self):
         scm = self.make_scm(logging_executive=True)
-        expected_stderr = "MOCK run_command: ['git', 'merge-base', u'refs/remotes/origin/master', 'HEAD'], cwd=/mock-checkoutMOCK run_command: ['git', 'diff', '--binary', '--no-ext-diff', '--full-index', '-M', 'MOCK output of child process', '--'], cwd=/mock-checkoutMOCK run_command: ['git', 'log', '-25'], cwd=/mock-checkout\n"
+        expected_stderr = "MOCK run_command: ['git', 'merge-base', u'refs/remotes/origin/master', 'HEAD'], cwd=%(checkout)s\nMOCK run_command: ['git', 'diff', '--binary', '--no-ext-diff', '--full-index', '-M', 'MOCK output of child process', '--'], cwd=%(checkout)s\nMOCK run_command: ['git', 'log', '-25'], cwd=None\n" % {'checkout': scm.checkout_root}
         OutputCapture().assert_outputs(self, scm.create_patch, expected_stderr=expected_stderr)