Changeset 90479 in webkit

Timestamp:

Jul 6, 2011 12:07:39 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-07-06 Adam Barth <​abarth@webkit.org>

Remove unused parameter from _add_test in test_expectations.py
​https://bugs.webkit.org/show_bug.cgi?id=64008

Reviewed by Eric Seidel.

• Scripts/webkitpy/layout_tests/layout_package/test_expectations.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/test_expectations.py (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-06  Adam Barth  <abarth@webkit.org>
+
+        Remove unused parameter from _add_test in test_expectations.py
+        https://bugs.webkit.org/show_bug.cgi?id=64008
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/webkitpy/layout_tests/layout_package/test_expectations.py:
+
 2011-07-06  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py

@@ -329 +329 @@
         return self.has_modifier(test, REBASELINE)
 
-
     def _handle_any_read_errors(self):
         if len(self._errors) or len(self._non_fatal_errors):
@@ -348 +347 @@
         options = []
         modifiers = []
-        num_matches = 0
         if self._full_test_list:
             for test in self._full_test_list:
                 if not test in self._test_list_paths:
-                    self._add_test(test, modifiers, num_matches, expectations,
-                                   options, overrides_allowed=False)
+                    self._add_test(test, modifiers, expectations, options, overrides_allowed=False)
 
     def _dict_of_sets(self, strings_to_constants):
@@ -496 +493 @@
 
         modifiers = [o for o in options if o in self.MODIFIERS]
-        self._add_tests(tests, expectations, test_list_path, lineno,
-                        modifiers, num_matches, options, overrides_allowed)
+        self._add_tests(tests, expectations, test_list_path, lineno, modifiers, num_matches, options, overrides_allowed)
 
     def _get_options_list(self, listString):
@@ -598 +594 @@
                    modifiers, num_matches, options, overrides_allowed):
         for test in tests:
-            if self._already_seen_better_match(test, test_list_path,
-                num_matches, lineno, overrides_allowed):
+            if self._already_seen_better_match(test, test_list_path, num_matches, lineno, overrides_allowed):
                 continue
 
             self._clear_expectations_for_test(test, test_list_path)
-            self._test_list_paths[test] = (self._fs.normpath(test_list_path),
-                num_matches, lineno)
-            self._add_test(test, modifiers, num_matches, expectations, options,
-                           overrides_allowed)
-
-    def _add_test(self, test, modifiers, num_matches, expectations, options,
-                  overrides_allowed):
+            self._test_list_paths[test] = (self._fs.normpath(test_list_path), num_matches, lineno)
+            self._add_test(test, modifiers, expectations, options, overrides_allowed)
+
+    def _add_test(self, test, modifiers, expectations, options, overrides_allowed):
         """Sets the expected state for a given test.
 
@@ -619 +611 @@
           test: test to add
           modifiers: sequence of modifier keywords ('wontfix', 'slow', etc.)
-          num_matches: number of modifiers that matched the configuration
           expectations: sequence of expectations (PASS, IMAGE, etc.)
           options: sequence of keywords and bug identifiers.