Changeset 56643 in webkit

Timestamp:

Mar 26, 2010 2:51:15 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-26 Eric Seidel <​eric@webkit.org>

Unreviewed test fix.
My change conflicted with one of Adam's causing test-webkitpy to fail.

Move commit_message_for_this_commit from scm to checkout
​https://bugs.webkit.org/show_bug.cgi?id=36629

• Scripts/webkitpy/common/checkout/api_unittest.py:
  • modified_changelogs is now on Checkout instead of scm.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/api_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-26  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed test fix.
+        My change conflicted with one of Adam's causing test-webkitpy to fail.
+
+        Move commit_message_for_this_commit from scm to checkout
+        https://bugs.webkit.org/show_bug.cgi?id=36629
+
+        * Scripts/webkitpy/common/checkout/api_unittest.py:
+         - modified_changelogs is now on Checkout instead of scm.
+
 2010-03-26  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/api_unittest.py

@@ -109 +109 @@
     # ChangeLog is difficult to mock at current.
     def test_commit_message_for_this_commit(self):
-        mock_scm = Mock()
-        mock_scm.modified_changelogs = lambda: ["ChangeLog1", "ChangeLog2"]
-        checkout = Checkout(mock_scm)
+        checkout = Checkout(None)
+        checkout.modified_changelogs = lambda: ["ChangeLog1", "ChangeLog2"]
         output = OutputCapture()
         expected_stderr = "Parsing ChangeLog: ChangeLog1\nParsing ChangeLog: ChangeLog2\n"