| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 96 |
| 97 def __contains__(self, item): | 97 def __contains__(self, item): |
| 98 return item in self.tests | 98 return item in self.tests |
| 99 | 99 |
| 100 def __getitem__(self, item): | 100 def __getitem__(self, item): |
| 101 return self.tests[item] | 101 return self.tests[item] |
| 102 | 102 |
| 103 # | 103 # |
| 104 # These numbers may need to be updated whenever we add or delete tests. This inc
ludes virtual tests. | 104 # These numbers may need to be updated whenever we add or delete tests. This inc
ludes virtual tests. |
| 105 # | 105 # |
| 106 TOTAL_TESTS = 113 | 106 TOTAL_TESTS = 114 |
| 107 TOTAL_SKIPS = 29 | 107 TOTAL_SKIPS = 29 |
| 108 | 108 |
| 109 UNEXPECTED_PASSES = 1 | 109 UNEXPECTED_PASSES = 1 |
| 110 UNEXPECTED_FAILURES = 26 | 110 UNEXPECTED_FAILURES = 26 |
| 111 | 111 |
| 112 def unit_test_list(): | 112 def unit_test_list(): |
| 113 tests = TestList() | 113 tests = TestList() |
| 114 tests.add('failures/expected/crash.html', crash=True) | 114 tests.add('failures/expected/crash.html', crash=True) |
| 115 tests.add('failures/expected/exception.html', exception=True) | 115 tests.add('failures/expected/exception.html', exception=True) |
| 116 tests.add('failures/expected/device_failure.html', device_failure=True) | 116 tests.add('failures/expected/device_failure.html', device_failure=True) |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 """To avoid surprises when introducing new macros, these are intentional
ly fixed in time.""" | 543 """To avoid surprises when introducing new macros, these are intentional
ly fixed in time.""" |
| 544 return {'mac': ['leopard', 'snowleopard'], 'win': ['xp', 'win7'], 'linux
': ['lucid']} | 544 return {'mac': ['leopard', 'snowleopard'], 'win': ['xp', 'win7'], 'linux
': ['lucid']} |
| 545 | 545 |
| 546 def all_baseline_variants(self): | 546 def all_baseline_variants(self): |
| 547 return self.ALL_BASELINE_VARIANTS | 547 return self.ALL_BASELINE_VARIANTS |
| 548 | 548 |
| 549 def virtual_test_suites(self): | 549 def virtual_test_suites(self): |
| 550 return [ | 550 return [ |
| 551 VirtualTestSuite(prefix='virtual_passes', base='passes', args=['--vi
rtual-arg']), | 551 VirtualTestSuite(prefix='virtual_passes', base='passes', args=['--vi
rtual-arg']), |
| 552 VirtualTestSuite(prefix='skipped', base='failures/expected', args=['
--virtual-arg2']), | 552 VirtualTestSuite(prefix='skipped', base='failures/expected', args=['
--virtual-arg2']), |
| 553 VirtualTestSuite(prefix='references_use_default_args', base='passes/
reftest.html', |
| 554 args=['--virtual-arg'], references_use_default_args
=True), |
| 553 ] | 555 ] |
| 554 | 556 |
| 555 | 557 |
| 556 class TestDriver(Driver): | 558 class TestDriver(Driver): |
| 557 """Test/Dummy implementation of the driver interface.""" | 559 """Test/Dummy implementation of the driver interface.""" |
| 558 next_pid = 1 | 560 next_pid = 1 |
| 559 | 561 |
| 560 def __init__(self, *args, **kwargs): | 562 def __init__(self, *args, **kwargs): |
| 561 super(TestDriver, self).__init__(*args, **kwargs) | 563 super(TestDriver, self).__init__(*args, **kwargs) |
| 562 self.started = False | 564 self.started = False |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 else: | 639 else: |
| 638 image = test.actual_image | 640 image = test.actual_image |
| 639 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 641 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 640 crash=(crash or web_process_crash), crashed_process_name=crashed_pro
cess_name, | 642 crash=(crash or web_process_crash), crashed_process_name=crashed_pro
cess_name, |
| 641 crashed_pid=crashed_pid, crash_log=crash_log, | 643 crashed_pid=crashed_pid, crash_log=crash_log, |
| 642 test_time=time.time() - start_time, timeout=test.timeout, error=test
.error, pid=self.pid, | 644 test_time=time.time() - start_time, timeout=test.timeout, error=test
.error, pid=self.pid, |
| 643 leak=test.leak) | 645 leak=test.leak) |
| 644 | 646 |
| 645 def stop(self): | 647 def stop(self): |
| 646 self.started = False | 648 self.started = False |
| OLD | NEW |