[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 479a159440248d627a71816343ff62e01d3f37be
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 05:12:45 2010 +0000

    2010-01-07  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Fix some test-webkitpy expectations
            https://bugs.webkit.org/show_bug.cgi?id=33345
    
            I forgot to change these when I added the CheckStyle step.
    
            * Scripts/webkitpy/commands/upload_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1438d8e..1acf9ef 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Eric Seidel.
 
+        Fix some test-webkitpy expectations
+        https://bugs.webkit.org/show_bug.cgi?id=33345
+
+        I forgot to change these when I added the CheckStyle step.
+
+        * Scripts/webkitpy/commands/upload_unittest.py:
+
+2010-01-07  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         webkit-patch edit-changelogs (or upload) will open blank files if run outside the root
         https://bugs.webkit.org/show_bug.cgi?id=33341
 
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py b/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
index 627f60c..4160aed 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
@@ -52,18 +52,18 @@ class UploadCommandsTest(CommandsTest):
         expected_stderr = "Obsoleting 2 old patches on bug 42\n"
         self.assert_execute_outputs(ObsoleteAttachments(), [42], expected_stderr=expected_stderr)
 
-    def test_post_diff(self):
-        expected_stderr = "Obsoleting 2 old patches on bug 42\n"
+    def test_post(self):
+        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\n"
         self.assert_execute_outputs(Post(), [42], expected_stderr=expected_stderr)
 
     def test_prepare_diff_with_arg(self):
         self.assert_execute_outputs(Prepare(), [42])
 
-    def test_prepare_diff(self):
+    def test_prepare(self):
         self.assert_execute_outputs(Prepare(), [])
 
-    def test_submit_patch(self):
-        expected_stderr = "Obsoleting 2 old patches on bug 42\n"
+    def test_upload(self):
+        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\n"
         self.assert_execute_outputs(Upload(), [42], expected_stderr=expected_stderr)
 
     def test_mark_bug_fixed(self):

-- 
WebKit Debian packaging