[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 526ba6c91db4df16ecea239ec3f76fcbd18aab76
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 02:32:22 2011 +0000

    2011-02-01  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Mihai Parparita.
    
            new-run-webkit-tests: stop skipping so many tests
    
            r77163 introduced a regression where we weren't resetting test
            expectations properly and were skipping too many tests as a
            result. This patch fixes that and adds a test for it.
    
            https://bugs.webkit.org/show_bug.cgi?id=53551
    
            * Scripts/webkitpy/layout_tests/layout_package/test_expectations.py:
            * Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77353 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0a50e83..eec8d95 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,20 @@
 2011-02-01  Dirk Pranke  <dpranke at chromium.org>
 
+        Reviewed by Mihai Parparita.
+
+        new-run-webkit-tests: stop skipping so many tests
+
+        r77163 introduced a regression where we weren't resetting test
+        expectations properly and were skipping too many tests as a
+        result. This patch fixes that and adds a test for it.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53551
+
+        * Scripts/webkitpy/layout_tests/layout_package/test_expectations.py:
+        * Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py:
+
+2011-02-01  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Tony Chang.
 
         new-run-webkit-tests: add first stub of test_runner2. This
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py
index 54030d0..494395a 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py
@@ -738,7 +738,7 @@ class TestExpectationsFile:
         """Sets the expected state for a given test.
 
         This routine assumes the test has not been added before. If it has,
-        use _ClearExpectationsForTest() to reset the state prior to
+        use _clear_expectations_for_test() to reset the state prior to
         calling this.
 
         Args:
@@ -783,12 +783,11 @@ class TestExpectationsFile:
         than a previous listing.
         """
         if test in self._test_list_paths:
-            base_path = self._test_list_paths[test][0]
-            self._test_to_expectations.pop(base_path, '')
-            self._remove_from_sets(base_path, self._expectation_to_tests)
-            self._remove_from_sets(base_path, self._modifier_to_tests)
-            self._remove_from_sets(base_path, self._timeline_to_tests)
-            self._remove_from_sets(base_path, self._result_type_to_tests)
+            self._test_to_expectations.pop(test, '')
+            self._remove_from_sets(test, self._expectation_to_tests)
+            self._remove_from_sets(test, self._modifier_to_tests)
+            self._remove_from_sets(test, self._timeline_to_tests)
+            self._remove_from_sets(test, self._result_type_to_tests)
 
         self._test_list_paths[test] = self._fs.normpath(test_list_path)
 
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py
index fd99d6b..05d805d 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py
@@ -242,6 +242,13 @@ BUG_OVERRIDE : failures/expected/text.html = CRASH
         self.assertTrue(match('failures/expected/crash.html', SKIP, False))
         self.assertTrue(match('passes/text.html', PASS, False))
 
+    def test_more_specific_override_resets_skip(self):
+        self.parse_exp("BUGX SKIP : failures/expected = TEXT\n"
+                       "BUGX : failures/expected/text.html = IMAGE\n")
+        self.assert_exp('failures/expected/text.html', IMAGE)
+        self.assertFalse(self._port._filesystem.join(self._port.layout_tests_dir(),
+                                                     'failures/expected/text.html') in
+                         self._exp.get_tests_with_result_type(SKIP))
 
 class ExpectationSyntaxTests(Base):
     def test_missing_expectation(self):

-- 
WebKit Debian packaging