| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """PyAuto: Python Interface to Chromium's Automation Proxy. | 6 """PyAuto: Python Interface to Chromium's Automation Proxy. |
| 7 | 7 |
| 8 PyAuto uses swig to expose Automation Proxy interfaces to Python. | 8 PyAuto uses swig to expose Automation Proxy interfaces to Python. |
| 9 For complete documentation on the functionality available, | 9 For complete documentation on the functionality available, |
| 10 run pydoc on this file. | 10 run pydoc on this file. |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 self._named_channel_id = named_channel_id | 191 self._named_channel_id = named_channel_id |
| 192 self.UseNamedChannelID(named_channel_id) | 192 self.UseNamedChannelID(named_channel_id) |
| 193 # Initialize automation and fire the browser (does not fire the browser | 193 # Initialize automation and fire the browser (does not fire the browser |
| 194 # on ChromeOS). | 194 # on ChromeOS). |
| 195 self.SetUp() | 195 self.SetUp() |
| 196 | 196 |
| 197 # Forcibly trigger all plugins to get registered. crbug.com/94123 | 197 # Forcibly trigger all plugins to get registered. crbug.com/94123 |
| 198 # Sometimes flash files loaded too quickly after firing browser | 198 # Sometimes flash files loaded too quickly after firing browser |
| 199 # ends up getting downloaded, which seems to indicate that the plugin | 199 # ends up getting downloaded, which seems to indicate that the plugin |
| 200 # hasn't been registered yet. | 200 # hasn't been registered yet. |
| 201 self.GetPluginsInfo() | 201 if not self.IsChromeOS(): |
| 202 self.GetPluginsInfo() |
| 202 | 203 |
| 203 # TODO(dtu): Remove this after crosbug.com/4558 is fixed. | 204 # TODO(dtu): Remove this after crosbug.com/4558 is fixed. |
| 204 if self.IsChromeOS(): | 205 if self.IsChromeOS(): |
| 205 self.WaitUntil(lambda: not self.GetNetworkInfo()['offline_mode']) | 206 self.WaitUntil(lambda: not self.GetNetworkInfo()['offline_mode']) |
| 206 | 207 |
| 207 # If we are connected to any RemoteHosts, create PyAuto | 208 # If we are connected to any RemoteHosts, create PyAuto |
| 208 # instances on the remote sides and set them up too. | 209 # instances on the remote sides and set them up too. |
| 209 for remote in self.remotes: | 210 for remote in self.remotes: |
| 210 remote.CreateTarget(self) | 211 remote.CreateTarget(self) |
| 211 remote.setUp() | 212 remote.setUp() |
| (...skipping 4694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4906 successful = result.wasSuccessful() | 4907 successful = result.wasSuccessful() |
| 4907 if not successful: | 4908 if not successful: |
| 4908 pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename) | 4909 pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename) |
| 4909 print >>sys.stderr, 'Tests can be disabled by editing %s. ' \ | 4910 print >>sys.stderr, 'Tests can be disabled by editing %s. ' \ |
| 4910 'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL) | 4911 'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL) |
| 4911 sys.exit(not successful) | 4912 sys.exit(not successful) |
| 4912 | 4913 |
| 4913 | 4914 |
| 4914 if __name__ == '__main__': | 4915 if __name__ == '__main__': |
| 4915 Main() | 4916 Main() |
| OLD | NEW |