| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
|
| index 67ca8bce188b6127c091266b79da0dc5c264aa6c..f65fb252491d3ba96f4cc866c12cff1d04e3affe 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
|
| @@ -269,7 +269,8 @@ class Manager(object):
|
| return TestInput(test_file,
|
| self._options.slow_time_out_ms if self._test_is_slow(test_file) else self._options.time_out_ms,
|
| self._test_requires_lock(test_file),
|
| - should_add_missing_baselines=(self._options.new_test_results and not self._test_is_expected_missing(test_file)))
|
| + should_add_missing_baselines=(self._options.new_test_results and
|
| + not self._test_is_expected_missing(test_file)))
|
|
|
| def _test_requires_lock(self, test_file):
|
| """Return True if the test needs to be locked when running multiple
|
| @@ -282,7 +283,9 @@ class Manager(object):
|
|
|
| def _test_is_expected_missing(self, test_file):
|
| expectations = self._expectations.model().get_expectations(test_file)
|
| - return test_expectations.MISSING in expectations or test_expectations.NEEDS_REBASELINE in expectations or test_expectations.NEEDS_MANUAL_REBASELINE in expectations
|
| + return (test_expectations.MISSING in expectations or
|
| + test_expectations.NEEDS_REBASELINE in expectations or
|
| + test_expectations.NEEDS_MANUAL_REBASELINE in expectations)
|
|
|
| def _test_is_slow(self, test_file):
|
| return test_expectations.SLOW in self._expectations.model().get_expectations(test_file)
|
| @@ -293,7 +296,8 @@ class Manager(object):
|
| def _rename_results_folder(self):
|
| try:
|
| timestamp = time.strftime(
|
| - "%Y-%m-%d-%H-%M-%S", time.localtime(self._filesystem.mtime(self._filesystem.join(self._results_directory, "results.html"))))
|
| + "%Y-%m-%d-%H-%M-%S", time.localtime(
|
| + self._filesystem.mtime(self._filesystem.join(self._results_directory, "results.html"))))
|
| except (IOError, OSError) as e:
|
| # It might be possible that results.html was not generated in previous run, because the test
|
| # run was interrupted even before testing started. In those cases, don't archive the folder.
|
| @@ -471,8 +475,9 @@ class Manager(object):
|
| self._port.clobber_old_port_specific_results()
|
|
|
| def _tests_to_retry(self, run_results):
|
| - # TODO(ojan): This should also check that result.type != test_expectations.MISSING since retrying missing expectations is silly.
|
| - # But that's a bit tricky since we only consider the last retry attempt for the count of unexpected regressions.
|
| + # TODO(ojan): This should also check that result.type != test_expectations.MISSING
|
| + # since retrying missing expectations is silly. But that's a bit tricky since we
|
| + # only consider the last retry attempt for the count of unexpected regressions.
|
| return [result.test_name for result in run_results.unexpected_results_by_name.values(
|
| ) if result.type != test_expectations.PASS]
|
|
|
|
|