[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[eric at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit e96f8a984d35998dcd0ed845a13c56bdb88ca325
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 02:57:19 2010 +0000

    2010-01-13  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Fix CloseBugForLandDiff unittest to actually run
            https://bugs.webkit.org/show_bug.cgi?id=33640
    
            * Scripts/webkitpy/mock_bugzillatool.py:
            * Scripts/webkitpy/steps/closebugforlanddiff_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53228 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bd9d65b..3a59bf1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-13  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Fix CloseBugForLandDiff unittest to actually run
+        https://bugs.webkit.org/show_bug.cgi?id=33640
+
+        * Scripts/webkitpy/mock_bugzillatool.py:
+        * Scripts/webkitpy/steps/closebugforlanddiff_unittest.py:
+
 2010-01-12  Jon Honeycutt  <jhoneycutt at apple.com>
 
         MSAA: selected, selectable, extended selectable, and multiple
diff --git a/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py b/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py
index 146e40b..978b8c4 100644
--- a/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py
+++ b/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py
@@ -183,6 +183,9 @@ class MockSCM(Mock):
     def diff_for_revision(self, revision):
         return "DiffForRevision%s\nhttp://bugs.webkit.org/show_bug.cgi?id=12345" % revision
 
+    def svn_revision_from_commit_text(self, commit_text):
+        return "49824"
+
     def modified_changelogs(self):
         # Ideally we'd return something more interesting here.
         # The problem is that LandDiff will try to actually read the path from disk!
diff --git a/WebKitTools/Scripts/webkitpy/steps/closebugforlanddiff_unittest.py b/WebKitTools/Scripts/webkitpy/steps/closebugforlanddiff_unittest.py
index 02700f5..73561ab 100644
--- a/WebKitTools/Scripts/webkitpy/steps/closebugforlanddiff_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/steps/closebugforlanddiff_unittest.py
@@ -33,8 +33,9 @@ from webkitpy.mock import Mock
 from webkitpy.mock_bugzillatool import MockBugzillaTool
 from webkitpy.outputcapture import OutputCapture
 
-class UpdateChangeLogsWithReviewerTest(unittest.TestCase):
+class CloseBugForLandDiffTest(unittest.TestCase):
     def test_empty_state(self):
         capture = OutputCapture()
         step = CloseBugForLandDiff(MockBugzillaTool(), Mock())
-        capture.assert_outputs(self, step.run, [{}])
+        expected_stderr = "Committed r49824: <http://trac.webkit.org/changeset/49824>\nNo bug id provided.\n"
+        capture.assert_outputs(self, step.run, [{"commit_text" : "Mock commit text"}], expected_stderr=expected_stderr)

-- 
WebKit Debian packaging