Changeset 85446 in webkit

Timestamp:

May 1, 2011 5:58:23 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-05-01 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Make most scm.py tests pass in preparation for splitting them up
​https://bugs.webkit.org/show_bug.cgi?id=59904

There is one remaining failure:
webkitpy.common.checkout.scm.scm_unittest.GitTestWithMock.test_create_patch
which identifies a difference between the SVN and Git versions of the
SCM api. I'm not going to bother fixing that until we split out all
the tests.

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-01  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Make most scm.py tests pass in preparation for splitting them up
+        https://bugs.webkit.org/show_bug.cgi?id=59904
+
+        There is one remaining failure:
+        webkitpy.common.checkout.scm.scm_unittest.GitTestWithMock.test_create_patch
+        which identifies a difference between the SVN and Git versions of the
+        SCM api.  I'm not going to bother fixing that until we split out all
+        the tests.
+
+        * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+
 2011-05-01  Patrick Gansterer  <paroga@webkit.org>
 

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

@@ -47 +47 @@
 from datetime import date
 from webkitpy.common.checkout.api import Checkout
-from webkitpy.common.checkout.scm import detect_scm_system, SCM, SVN, Git, CheckoutNeedsUpdate, commit_error_handler, AuthenticationError, AmbiguousCommitError, find_checkout_root, default_scm
+from .scm import detect_scm_system, SCM, SVN, Git, CheckoutNeedsUpdate, commit_error_handler, AuthenticationError, AmbiguousCommitError, find_checkout_root, default_scm
 from webkitpy.common.config.committers import Committer  # FIXME: This should not be needed
 from webkitpy.common.net.bugzilla import Attachment # FIXME: This should not be needed
@@ -286 +286 @@
         attachment.contents = lambda: patch_contents
 
-        joe_cool = Committer(name="Joe Cool", email_or_emails=None)
+        joe_cool = Committer("Joe Cool", "joe@cool.com")
         attachment.reviewer = lambda: joe_cool
 
@@ -1451 +1451 @@
 
     def test_create_patch(self):
-        expected_stderr = "MOCK run_command: ['git', 'merge-base', u'refs/remotes/origin/master', 'HEAD']\nMOCK run_command: ['git', 'diff', '--binary', '--no-ext-diff', '--full-index', '-M', 'MOCK output of child process', '--']\n"
+        expected_stderr = "MOCK run_command: ['git', 'merge-base', u'refs/remotes/origin/master', 'HEAD']\nMOCK run_command: ['git', 'diff', '--binary', '--no-ext-diff', '--full-index', '-M', 'MOCK output of child process', '--']\nMOCK run_command: ['git', 'log', '-25']\n"
         OutputCapture().assert_outputs(self, self.scm.create_patch, kwargs={'changed_files': None}, expected_stderr=expected_stderr)