| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| 11 # in the documentation and/or other materials provided with the | 11 # in the documentation and/or other materials provided with the |
| 12 # distribution. | 12 # distribution. |
| 13 # * Neither the name of Google Inc. nor the names of its | 13 # * Neither the name of Google Inc. nor the names of its |
| 14 # contributors may be used to endorse or promote products derived from | 14 # contributors may be used to endorse or promote products derived from |
| 15 # this software without specific prior written permission. | 15 # this software without specific prior written permission. |
| 16 # | 16 # |
| 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 import webkitpy.thirdparty.unittest2 as unittest | 29 import unittest |
| 30 | 30 |
| 31 from webkitpy.common.host_mock import MockHost | 31 from webkitpy.common.host_mock import MockHost |
| 32 from webkitpy.layout_tests.models import test_expectations | 32 from webkitpy.layout_tests.models import test_expectations |
| 33 from webkitpy.layout_tests.models import test_failures | 33 from webkitpy.layout_tests.models import test_failures |
| 34 from webkitpy.layout_tests.models import test_results | 34 from webkitpy.layout_tests.models import test_results |
| 35 from webkitpy.layout_tests.models import test_run_results | 35 from webkitpy.layout_tests.models import test_run_results |
| 36 | 36 |
| 37 | 37 |
| 38 def get_result(test_name, result_type=test_expectations.PASS, run_time=0): | 38 def get_result(test_name, result_type=test_expectations.PASS, run_time=0): |
| 39 failures = [] | 39 failures = [] |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 def test_timeout_then_unexpected_pass(self): | 197 def test_timeout_then_unexpected_pass(self): |
| 198 tests = ['failures/expected/image.html'] | 198 tests = ['failures/expected/image.html'] |
| 199 expectations = test_expectations.TestExpectations(self.port, tests) | 199 expectations = test_expectations.TestExpectations(self.port, tests) |
| 200 initial_results = test_run_results.TestRunResults(expectations, len(test
s)) | 200 initial_results = test_run_results.TestRunResults(expectations, len(test
s)) |
| 201 initial_results.add(get_result('failures/expected/image.html', test_expe
ctations.TIMEOUT, run_time=1), False, False) | 201 initial_results.add(get_result('failures/expected/image.html', test_expe
ctations.TIMEOUT, run_time=1), False, False) |
| 202 retry_results = test_run_results.TestRunResults(expectations, len(tests)
) | 202 retry_results = test_run_results.TestRunResults(expectations, len(tests)
) |
| 203 retry_results.add(get_result('failures/expected/image.html', test_expect
ations.PASS, run_time=0.1), False, False) | 203 retry_results.add(get_result('failures/expected/image.html', test_expect
ations.PASS, run_time=0.1), False, False) |
| 204 summary = test_run_results.summarize_results(self.port, expectations, in
itial_results, retry_results, enabled_pixel_tests_in_retry=True, only_include_fa
iling=True) | 204 summary = test_run_results.summarize_results(self.port, expectations, in
itial_results, retry_results, enabled_pixel_tests_in_retry=True, only_include_fa
iling=True) |
| 205 self.assertEquals(summary['num_regressions'], 0) | 205 self.assertEquals(summary['num_regressions'], 0) |
| 206 self.assertEquals(summary['num_passes'], 1) | 206 self.assertEquals(summary['num_passes'], 1) |
| OLD | NEW |