Fix breakage where none of the tests would get listed. Not sure why

this didn't work, but this fixes it and lets me reopen the tree. TBR.
Review URL: http://codereview.chromium.org/42473

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12237 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 5 deletions

diff --git a/webkit/tools/layout_tests/layout_package/test_expectations.py b/webkit/tools/layout_tests/layout_package/test_expectations.py
index 7d8579a..3dbb0eb 100644
--- a/webkit/tools/layout_tests/layout_package/test_expectations.py
+++ b/webkit/tools/layout_tests/layout_package/test_expectations.py
@@ -188,11 +188,14 @@ class TestExpectationsFile:
     self._test_list_paths = {}
 
     # Maps a modifier to a set of tests.
-    self._modifier_to_tests = dict.fromkeys(self.MODIFIERS.itervalues(), set())
+    self._modifier_to_tests = {}
+    for modifier in self.MODIFIERS.itervalues():
+      self._modifier_to_tests[modifier] = set()
 
     # Maps an expectation to a set of tests.
-    self._expectation_to_tests = dict.fromkeys(self.EXPECTATIONS.itervalues(),
-        set())
+    self._expectation_to_tests = {}
+    for expectation in self.EXPECTATIONS.itervalues():
+      self._expectation_to_tests[expectation] = set()
 
     self._Read(path)
 
@@ -305,7 +308,7 @@ class TestExpectationsFile:
 
   def _GetOptionsList(self, listString):
     # TODO(ojan): Add a check that all the options are either in self.MODIFIERS
-    # or self.PLATFORMS or starts with BUGxxxxx
+    # or self.PLATFORMS or starts with BUGxxxx
     return [part.strip().lower() for part in listString.strip().split(' ')]
 
   def _ParseExpectations(self, string):
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index e13ff8b..8f251b8 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -40,7 +40,7 @@ WONTFIX SKIP : LayoutTests/dom/xhtml = PASS
 // We do not want to support Legacy mac encodings on Windows/Linux.
 // On Mac, we can support them by building platform/text/mac, but
 // probably we don't want there, either.
-BUG12345 WONTFIX SKIP WIN LINUX : LayoutTests/fast/encoding/char-encoding-mac.html = FAIL
+WONTFIX SKIP WIN LINUX : LayoutTests/fast/encoding/char-encoding-mac.html = FAIL
 
 // Fails due to different window.close() rules.  See bug 753420.  We need
 // to decide whether we ever expect to pass this.  Now also timing out.