[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 506fa78724dbb565a7c6c95c64571ce46cde9d9c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 8 22:34:14 2011 +0000

    2011-01-08  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Mihai Parparita.
    
            commit-queue hangs when the ChangeLog diff is bad
            https://bugs.webkit.org/show_bug.cgi?id=52072
    
            * Scripts/webkitpy/tool/steps/validatechangelogs.py:
            * Scripts/webkitpy/tool/steps/validatechangelogs_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75328 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 364e941..eb6f285 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-08  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Mihai Parparita.
+
+        commit-queue hangs when the ChangeLog diff is bad
+        https://bugs.webkit.org/show_bug.cgi?id=52072
+
+        * Scripts/webkitpy/tool/steps/validatechangelogs.py:
+        * Scripts/webkitpy/tool/steps/validatechangelogs_unittest.py:
+
 2011-01-08  Adam Barth  <abarth at webkit.org>
 
         Teach svn-apply how to re-write WebCore to Source/WebCore.
diff --git a/Tools/Scripts/webkitpy/tool/steps/validatechangelogs.py b/Tools/Scripts/webkitpy/tool/steps/validatechangelogs.py
index e812f94..a27ed77 100644
--- a/Tools/Scripts/webkitpy/tool/steps/validatechangelogs.py
+++ b/Tools/Scripts/webkitpy/tool/steps/validatechangelogs.py
@@ -44,6 +44,9 @@ class ValidateChangeLogs(AbstractStep):
         # later than that, assume that the entry is wrong.
         if diff_file.lines[0][0] < 8:
             return True
+        if self._options.non_interactive:
+            return False
+
         log("The diff to %s looks wrong.  Are you sure your ChangeLog entry is at the top of the file?" % (diff_file.filename))
         # FIXME: Do we need to make the file path absolute?
         self._tool.scm().diff_for_file(diff_file.filename)
diff --git a/Tools/Scripts/webkitpy/tool/steps/validatechangelogs_unittest.py b/Tools/Scripts/webkitpy/tool/steps/validatechangelogs_unittest.py
index 66db793..db35a58 100644
--- a/Tools/Scripts/webkitpy/tool/steps/validatechangelogs_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/steps/validatechangelogs_unittest.py
@@ -36,20 +36,24 @@ from webkitpy.tool.steps.validatechangelogs import ValidateChangeLogs
 
 class ValidateChangeLogsTest(unittest.TestCase):
 
-    def _assert_start_line_produces_output(self, start_line, should_prompt_user=False):
+    def _assert_start_line_produces_output(self, start_line, should_fail=False, non_interactive=False):
         tool = MockTool()
         tool._checkout.is_path_to_changelog = lambda path: True
-        step = ValidateChangeLogs(tool, MockOptions(git_commit=None))
+        step = ValidateChangeLogs(tool, MockOptions(git_commit=None, non_interactive=non_interactive))
         diff_file = Mock()
         diff_file.filename = "mock/ChangeLog"
         diff_file.lines = [(start_line, start_line, "foo")]
         expected_stdout = expected_stderr = ""
-        if should_prompt_user:
+        if should_fail and not non_interactive:
             expected_stdout = "OK to continue?\n"
             expected_stderr = "The diff to mock/ChangeLog looks wrong.  Are you sure your ChangeLog entry is at the top of the file?\n"
-        OutputCapture().assert_outputs(self, step._check_changelog_diff, [diff_file], expected_stdout=expected_stdout, expected_stderr=expected_stderr)
+        result = OutputCapture().assert_outputs(self, step._check_changelog_diff, [diff_file], expected_stdout=expected_stdout, expected_stderr=expected_stderr)
+        self.assertEqual(not result, should_fail)
 
     def test_check_changelog_diff(self):
-        self._assert_start_line_produces_output(1, should_prompt_user=False)
-        self._assert_start_line_produces_output(7, should_prompt_user=False)
-        self._assert_start_line_produces_output(8, should_prompt_user=True)
+        self._assert_start_line_produces_output(1)
+        self._assert_start_line_produces_output(7)
+        self._assert_start_line_produces_output(8, should_fail=True)
+
+        self._assert_start_line_produces_output(1, non_interactive=False)
+        self._assert_start_line_produces_output(8, non_interactive=True, should_fail=True)

-- 
WebKit Debian packaging