[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c872e25748ab2081231618417f2158c2b3109add
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 09:49:18 2010 +0000

    2010-01-04  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Add missing unit test for CommitMessageForCurrentDiff
            https://bugs.webkit.org/show_bug.cgi?id=33141
    
            * Scripts/webkitpy/commands/upload.py:
            * Scripts/webkitpy/commands/upload_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52720 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b26e80b..14acbc6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        Add missing unit test for CommitMessageForCurrentDiff
+        https://bugs.webkit.org/show_bug.cgi?id=33141
+
+        * Scripts/webkitpy/commands/upload.py:
+        * Scripts/webkitpy/commands/upload_unittest.py:
+
+2010-01-04  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Remove raw_input from queues in favor of user.prompt
         https://bugs.webkit.org/show_bug.cgi?id=33140
 
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload.py b/WebKitTools/Scripts/webkitpy/commands/upload.py
index 3afb1e2..7a216a3 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload.py
@@ -43,9 +43,9 @@ from webkitpy.comments import bug_comment_from_svn_revision
 from webkitpy.committers import CommitterList
 from webkitpy.grammar import pluralize
 from webkitpy.webkit_logging import error, log
+from webkitpy.mock import Mock
 from webkitpy.multicommandtool import AbstractDeclarativeCommmand
 
-# FIXME: Requires unit test.
 class CommitMessageForCurrentDiff(AbstractDeclarativeCommmand):
     name = "commit-message"
     help_text = "Print a commit message suitable for the uncommitted changes"
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py b/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
index 4a7f1cd..b30935f 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
@@ -33,6 +33,14 @@ from webkitpy.commands.upload import *
 from webkitpy.mock_bugzillatool import MockBugzillaTool
 
 class UploadCommandsTest(CommandsTest):
+    def test_commit_message_for_current_diff(self):
+        tool = MockBugzillaTool()
+        mock_commit_message_for_this_commit = Mock()
+        mock_commit_message_for_this_commit.message = lambda: "Mock message"
+        tool._scm.commit_message_for_this_commit = lambda: mock_commit_message_for_this_commit
+        expected_stdout = "Mock message\n"
+        self.assert_execute_outputs(CommitMessageForCurrentDiff(), [], expected_stdout=expected_stdout, tool=tool)
+
     def test_assign_to_committer(self):
         tool = MockBugzillaTool()
         expected_stderr = "Bug 75 is already assigned to foo at foo.com (None).\nBug 76 has no non-obsolete patches, ignoring.\n"

-- 
WebKit Debian packaging