| Index: Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| diff --git a/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py b/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| index 0c77183f0511110d333abb0455cfb47b5190ce07..afc7b87c59c7da95b014efd3e38270e10fc36c62 100644
|
| --- a/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| +++ b/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| @@ -1026,21 +1026,22 @@ class TestExpectations(object):
|
| def has_warnings(self):
|
| return self._has_warnings
|
|
|
| - def remove_configuration_from_test(self, test, test_configuration):
|
| + def remove_configurations(self, removals):
|
| expectations_to_remove = []
|
| modified_expectations = []
|
|
|
| - for expectation in self._expectations:
|
| - if expectation.name != test or not expectation.parsed_expectations:
|
| - continue
|
| - if test_configuration not in expectation.matching_configurations:
|
| - continue
|
| + for test, test_configuration in removals:
|
| + for expectation in self._expectations:
|
| + if expectation.name != test or not expectation.parsed_expectations:
|
| + continue
|
| + if test_configuration not in expectation.matching_configurations:
|
| + continue
|
|
|
| - expectation.matching_configurations.remove(test_configuration)
|
| - if expectation.matching_configurations:
|
| - modified_expectations.append(expectation)
|
| - else:
|
| - expectations_to_remove.append(expectation)
|
| + expectation.matching_configurations.remove(test_configuration)
|
| + if expectation.matching_configurations:
|
| + modified_expectations.append(expectation)
|
| + else:
|
| + expectations_to_remove.append(expectation)
|
|
|
| for expectation in expectations_to_remove:
|
| index = self._expectations.index(expectation)
|
|
|