| 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 Google name nor the names of its | 13 # * Neither the Google name 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 base64 | 29 import base64 |
| 30 import copy | |
| 31 import sys | |
| 32 import time | 30 import time |
| 33 | 31 |
| 34 from webkitpy.layout_tests.port.base import Port, VirtualTestSuite | 32 from webkitpy.layout_tests.port.base import Port, VirtualTestSuite |
| 35 from webkitpy.layout_tests.port.driver import DeviceFailure, Driver, DriverOutpu
t | 33 from webkitpy.layout_tests.port.driver import DeviceFailure, Driver, DriverOutpu
t |
| 36 from webkitpy.layout_tests.models.test_configuration import TestConfiguration | 34 from webkitpy.layout_tests.models.test_configuration import TestConfiguration |
| 37 from webkitpy.layout_tests.models import test_run_results | 35 from webkitpy.layout_tests.models import test_run_results |
| 38 from webkitpy.common.system.filesystem_mock import MockFileSystem | 36 from webkitpy.common.system.filesystem_mock import MockFileSystem |
| 39 from webkitpy.common.system.crashlogs import CrashLogs | 37 from webkitpy.common.system.crashlogs import CrashLogs |
| 40 | 38 |
| 41 | 39 |
| (...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 else: | 658 else: |
| 661 image = test.actual_image | 659 image = test.actual_image |
| 662 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 660 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 663 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, | 661 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, |
| 664 crashed_pid=crashed_pid, crash_log=crash_log, | 662 crashed_pid=crashed_pid, crash_log=crash_log, |
| 665 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, | 663 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, |
| 666 leak=test.leak) | 664 leak=test.leak) |
| 667 | 665 |
| 668 def stop(self): | 666 def stop(self): |
| 669 self.started = False | 667 self.started = False |
| OLD | NEW |