[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 29950c1b34554eeb42efc8227361c96398fcf7a3
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 01:26:10 2010 +0000

    2010-12-14  Ojan Vafai  <ojan at chromium.org>
    
            Fix python unittests after http://trac.webkit.org/changeset/74070.
    
            * Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 33dc20f..fbb301e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-14  Ojan Vafai  <ojan at chromium.org>
+
+        Fix python unittests after http://trac.webkit.org/changeset/74070.
+
+        * Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
+
 2010-12-14  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Jian Li.
diff --git a/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py b/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py
index 31f0b40..9817c5d 100644
--- a/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py
@@ -93,30 +93,35 @@ class TestExpectationsTestCase(unittest.TestCase):
             ["passes/text.html = CRASH TIMEOUT FAIL PASS"],
             "")
         self.assert_lines_lint(
-            ["BUG1234 MAC : passes/text.html = PASS FAIL"],
+            ["BUGCR1234 MAC : passes/text.html = PASS FAIL"],
             "")
         self.assert_lines_lint(
-            ["SKIP BUG1234 : passes/text.html = TIMEOUT PASS"],
+            ["SKIP BUGCR1234 : passes/text.html = TIMEOUT PASS"],
             "")
         self.assert_lines_lint(
-            ["BUG1234 DEBUG : passes/text.html = TIMEOUT PASS"],
+            ["BUGCR1234 DEBUG : passes/text.html = TIMEOUT PASS"],
             "")
         self.assert_lines_lint(
-            ["BUG1234 DEBUG SKIP : passes/text.html = TIMEOUT PASS"],
+            ["BUGCR1234 DEBUG SKIP : passes/text.html = TIMEOUT PASS"],
             "")
         self.assert_lines_lint(
-            ["BUG1234 MAC DEBUG SKIP : passes/text.html = TIMEOUT PASS"],
+            ["BUGCR1234 MAC DEBUG SKIP : passes/text.html = TIMEOUT PASS"],
             "")
         self.assert_lines_lint(
-            ["BUG1234 DEBUG MAC : passes/text.html = TIMEOUT PASS"],
+            ["BUGCR1234 DEBUG MAC : passes/text.html = TIMEOUT PASS"],
             "")
         self.assert_lines_lint(
-            ["SLOW BUG1234 : passes/text.html = PASS"],
+            ["SLOW BUGCR1234 : passes/text.html = PASS"],
             "")
         self.assert_lines_lint(
             ["WONTFIX SKIP : passes/text.html = TIMEOUT"],
             "")
 
+    def test_modifier_errors(self):
+        self.assert_lines_lint(
+            ["BUG1234 : passes/text.html = FAIL"],
+            'Bug must be either BUGCR, BUGWK, or BUGV8_ for test: bug1234 passes/text.html  [test/expectations] [5]')
+
     def test_valid_modifiers(self):
         self.assert_lines_lint(
             ["INVALID-MODIFIER : passes/text.html = PASS"],

-- 
WebKit Debian packaging