| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| index fcaf50b03b19485242c2a000f6611fd926a9b785..9e5384e5aec86b4001b0c9094948a05ce2d0a387 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
|
| @@ -1167,7 +1167,6 @@ class TestExpectations(object):
|
| expectation_line = self._parser.expectation_line_for_test(test_name, bot_expectations[test_name])
|
|
|
| # Unexpected results are merged into existing expectations.
|
| - merge = self._port.get_option('ignore_flaky_tests') == 'unexpected'
|
| model.add_expectation_line(expectation_line)
|
| self._model.merge_model(model)
|
|
|
|
|