| 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 self.assertEqual(content_block.content_type, 'image/png') | 124 self.assertEqual(content_block.content_type, 'image/png') |
| 125 self.assertEqual(content_block.content_hash, 'actual') | 125 self.assertEqual(content_block.content_hash, 'actual') |
| 126 self.assertEqual(content_block.encoding, 'base64') | 126 self.assertEqual(content_block.encoding, 'base64') |
| 127 self.assertEqual(content_block.content, 'MTIzNDU2NzgK') | 127 self.assertEqual(content_block.content, 'MTIzNDU2NzgK') |
| 128 self.assertEqual(content_block.decoded_content, '12345678\n') | 128 self.assertEqual(content_block.decoded_content, '12345678\n') |
| 129 | 129 |
| 130 def test_no_timeout(self): | 130 def test_no_timeout(self): |
| 131 port = TestWebKitPort() | 131 port = TestWebKitPort() |
| 132 port._config.build_directory = lambda configuration: '/mock-checkout/out
/' + configuration | 132 port._config.build_directory = lambda configuration: '/mock-checkout/out
/' + configuration |
| 133 driver = Driver(port, 0, pixel_tests=True, no_timeout=True) | 133 driver = Driver(port, 0, pixel_tests=True, no_timeout=True) |
| 134 self.assertEqual(driver.cmd_line(True, []), ['/mock-checkout/out/Release
/content_shell', '--no-timeout', '--run-layout-test', '--enable-slimming-paint',
'-']) | 134 cmd_line = driver.cmd_line(True, []) |
| 135 self.assertEqual(cmd_line[0], '/mock-checkout/out/Release/content_shell'
) |
| 136 self.assertEqual(cmd_line[-1], '-') |
| 137 self.assertTrue('--no-timeout' in cmd_line) |
| 135 | 138 |
| 136 def test_check_for_driver_crash(self): | 139 def test_check_for_driver_crash(self): |
| 137 port = TestWebKitPort() | 140 port = TestWebKitPort() |
| 138 driver = Driver(port, 0, pixel_tests=True) | 141 driver = Driver(port, 0, pixel_tests=True) |
| 139 | 142 |
| 140 class FakeServerProcess(object): | 143 class FakeServerProcess(object): |
| 141 def __init__(self, crashed): | 144 def __init__(self, crashed): |
| 142 self.crashed = crashed | 145 self.crashed = crashed |
| 143 | 146 |
| 144 def pid(self): | 147 def pid(self): |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 last_tmpdir = port._filesystem.last_tmpdir | 240 last_tmpdir = port._filesystem.last_tmpdir |
| 238 driver._start(True, []) | 241 driver._start(True, []) |
| 239 self.assertFalse(port._filesystem.isdir(last_tmpdir)) | 242 self.assertFalse(port._filesystem.isdir(last_tmpdir)) |
| 240 | 243 |
| 241 def test_start_actually_starts(self): | 244 def test_start_actually_starts(self): |
| 242 port = TestWebKitPort() | 245 port = TestWebKitPort() |
| 243 port._server_process_constructor = MockServerProcess | 246 port._server_process_constructor = MockServerProcess |
| 244 driver = Driver(port, 0, pixel_tests=True) | 247 driver = Driver(port, 0, pixel_tests=True) |
| 245 driver.start(True, [], None) | 248 driver.start(True, [], None) |
| 246 self.assertTrue(driver._server_process.started) | 249 self.assertTrue(driver._server_process.started) |
| OLD | NEW |