2010-12-14 Ojan Vafai <ojan@chromium.org>

        Fix python unittests after http://trac.webkit.org/changeset/74070.

        * Scripts/webkitpy/style/checkers/test_expectations_unittest.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@74082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 33dc20f8b2dbd9da832ed2c45f776ed2fc82a74b..fbb301e81c7ec45c4921d94ba5f1bd962d437227 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-14  Ojan Vafai  <ojan@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@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 31f0b4088ef675b90001a35a4eb634951fb3cd21..9817c5d702d3e661e06cb6af76c78a75e87c072d 100644 (file)
--- 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"],