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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit b408a24623c6d28dcfdbaebe962517cf12c8cecc
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 18:09:36 2009 +0000

    2009-11-27  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] unit test ApplyPatches and ApplyAttachment
            https://bugs.webkit.org/show_bug.cgi?id=31935
    
            * Scripts/modules/commands/download.py:
            * Scripts/modules/commands/download_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51443 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ce5e402..c92e351 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        [bzt] unit test ApplyPatches and ApplyAttachment
+        https://bugs.webkit.org/show_bug.cgi?id=31935
+
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/commands/download_unittest.py:
+
+2009-11-27  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         [bzt] Unit test download commands
         https://bugs.webkit.org/show_bug.cgi?id=31923
 
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 365b407..31af133 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -79,7 +79,6 @@ class Build(Command):
         sequence.run_and_handle_errors()
 
 
-# FIXME: Requires unit test. Blocking issue: WebKitApplyingScripts
 class ApplyAttachment(Command):
     name = "apply-attachment"
     show_in_main_help = True
@@ -95,7 +94,6 @@ class ApplyAttachment(Command):
         WebKitApplyingScripts.apply_patches_with_options(tool.scm(), [attachment], options)
 
 
-# FIXME: Requires unit test. Blocking issue: WebKitApplyingScripts
 class ApplyPatches(Command):
     name = "apply-patches"
     show_in_main_help = True
diff --git a/WebKitTools/Scripts/modules/commands/download_unittest.py b/WebKitTools/Scripts/modules/commands/download_unittest.py
index d0fff6e..a1ed41a 100644
--- a/WebKitTools/Scripts/modules/commands/download_unittest.py
+++ b/WebKitTools/Scripts/modules/commands/download_unittest.py
@@ -49,6 +49,18 @@ class DownloadCommandsTest(CommandsTest):
     def test_build(self):
         self.assert_execute_outputs(Build(), [], options=self._default_options())
 
+    def test_apply_attachment(self):
+        options = self._default_options()
+        options.update = True
+        options.local_commit = True
+        self.assert_execute_outputs(ApplyAttachment(), [197], options=options)
+
+    def test_apply_patches(self):
+        options = self._default_options()
+        options.update = True
+        options.local_commit = True
+        self.assert_execute_outputs(ApplyPatches(), [42], options=options)
+
     def test_land_diff(self):
         self.assert_execute_outputs(LandDiff(), [42], options=self._default_options())
 

-- 
WebKit Debian packaging