| 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 |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 | 357 |
| 358 class TestPort(Port): | 358 class TestPort(Port): |
| 359 port_name = 'test' | 359 port_name = 'test' |
| 360 default_port_name = 'test-mac-mac10.10' | 360 default_port_name = 'test-mac-mac10.10' |
| 361 | 361 |
| 362 FALLBACK_PATHS = { | 362 FALLBACK_PATHS = { |
| 363 'win7': ['test-win-win7', 'test-win-win10'], | 363 'win7': ['test-win-win7', 'test-win-win10'], |
| 364 'win10': ['test-win-win10'], | 364 'win10': ['test-win-win10'], |
| 365 'mac10.10': ['test-mac-mac10.10', 'test-mac-mac10.11'], | 365 'mac10.10': ['test-mac-mac10.10', 'test-mac-mac10.11'], |
| 366 'mac10.11': ['test-mac-mac10.11'], | 366 'mac10.11': ['test-mac-mac10.11'], |
| 367 'trusty': ['test-linux-trusty', 'test-win-win7'], | 367 'trusty': ['test-linux-trusty', 'test-win-win10'], |
| 368 'precise': ['test-linux-precise', 'test-linux-trusty', 'test-win-win7'], | 368 'precise': ['test-linux-precise', 'test-linux-trusty', 'test-win-win10']
, |
| 369 } | 369 } |
| 370 | 370 |
| 371 @classmethod | 371 @classmethod |
| 372 def determine_full_port_name(cls, host, options, port_name): | 372 def determine_full_port_name(cls, host, options, port_name): |
| 373 if port_name == 'test': | 373 if port_name == 'test': |
| 374 return TestPort.default_port_name | 374 return TestPort.default_port_name |
| 375 return port_name | 375 return port_name |
| 376 | 376 |
| 377 def __init__(self, host, port_name=None, **kwargs): | 377 def __init__(self, host, port_name=None, **kwargs): |
| 378 Port.__init__(self, host, port_name or TestPort.default_port_name, **kwa
rgs) | 378 Port.__init__(self, host, port_name or TestPort.default_port_name, **kwa
rgs) |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 else: | 632 else: |
| 633 image = test.actual_image | 633 image = test.actual_image |
| 634 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 634 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 635 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, | 635 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, |
| 636 crashed_pid=crashed_pid, crash_log=crash_log, | 636 crashed_pid=crashed_pid, crash_log=crash_log, |
| 637 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, | 637 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, |
| 638 leak=test.leak) | 638 leak=test.leak) |
| 639 | 639 |
| 640 def stop(self): | 640 def stop(self): |
| 641 self.started = False | 641 self.started = False |
| OLD | NEW |