Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py |
index 127e1e6014cfdbfbb20798f102eca0048c3cd1e2..5379a4e0879ba8fa356965c5e6627a65561787b0 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py |
@@ -26,18 +26,15 @@ |
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- |
import logging |
from webkitpy.layout_tests.controllers import repaint_overlay |
from webkitpy.layout_tests.models import test_failures |
- |
_log = logging.getLogger(__name__) |
-def write_test_result(filesystem, port, results_directory, test_name, driver_output, |
- expected_driver_output, failures): |
+def write_test_result(filesystem, port, results_directory, test_name, driver_output, expected_driver_output, failures): |
"""Write the test result to the result output directory.""" |
root_output_dir = results_directory |
writer = TestResultWriter(filesystem, port, root_output_dir, test_name) |
@@ -48,8 +45,7 @@ def write_test_result(filesystem, port, results_directory, test_name, driver_out |
for failure in failures: |
# FIXME: Instead of this long 'if' block, each failure class might |
# have a responsibility for writing a test result. |
- if isinstance(failure, (test_failures.FailureMissingResult, |
- test_failures.FailureTextMismatch, |
+ if isinstance(failure, (test_failures.FailureMissingResult, test_failures.FailureTextMismatch, |
test_failures.FailureTestHarnessAssertion)): |
writer.write_text_files(driver_output.text, expected_driver_output.text) |
writer.create_text_diff_and_write_result(driver_output.text, expected_driver_output.text) |
@@ -60,8 +56,7 @@ def write_test_result(filesystem, port, results_directory, test_name, driver_out |
elif isinstance(failure, test_failures.FailureImageHashMismatch): |
writer.write_image_files(driver_output.image, expected_driver_output.image) |
writer.write_image_diff_files(driver_output.image_diff) |
- elif isinstance(failure, (test_failures.FailureAudioMismatch, |
- test_failures.FailureMissingAudio)): |
+ elif isinstance(failure, (test_failures.FailureAudioMismatch, test_failures.FailureMissingAudio)): |
writer.write_audio_files(driver_output.audio, expected_driver_output.audio) |
elif isinstance(failure, test_failures.FailureCrash): |
crashed_driver_output = expected_driver_output if failure.is_reftest else driver_output |