| OLD | NEW |
| 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 self._dump_reader.clobber_old_results() | 624 self._dump_reader.clobber_old_results() |
| 625 | 625 |
| 626 # Overridden protected methods. | 626 # Overridden protected methods. |
| 627 | 627 |
| 628 def _build_path(self, *comps): | 628 def _build_path(self, *comps): |
| 629 return self._host_port._build_path(*comps) | 629 return self._host_port._build_path(*comps) |
| 630 | 630 |
| 631 def _build_path_with_configuration(self, configuration, *comps): | 631 def _build_path_with_configuration(self, configuration, *comps): |
| 632 return self._host_port._build_path_with_configuration(configuration, *co
mps) | 632 return self._host_port._build_path_with_configuration(configuration, *co
mps) |
| 633 | 633 |
| 634 def _path_to_apache(self): | 634 def path_to_apache(self): |
| 635 return self._host_port._path_to_apache() | 635 return self._host_port.path_to_apache() |
| 636 | 636 |
| 637 def _path_to_apache_config_file(self): | 637 def path_to_apache_config_file(self): |
| 638 return self._host_port._path_to_apache_config_file() | 638 return self._host_port.path_to_apache_config_file() |
| 639 | 639 |
| 640 def _path_to_driver(self, configuration=None): | 640 def _path_to_driver(self, configuration=None): |
| 641 return self._build_path_with_configuration(configuration, self._driver_d
etails.apk_name()) | 641 return self._build_path_with_configuration(configuration, self._driver_d
etails.apk_name()) |
| 642 | 642 |
| 643 def _path_to_helper(self): | 643 def _path_to_helper(self): |
| 644 return None | 644 return None |
| 645 | 645 |
| 646 def _path_to_image_diff(self): | 646 def _path_to_image_diff(self): |
| 647 return self._host_port._path_to_image_diff() | 647 return self._host_port._path_to_image_diff() |
| 648 | 648 |
| 649 def _path_to_lighttpd(self): | 649 def path_to_lighttpd(self): |
| 650 return self._host_port._path_to_lighttpd() | 650 return self._host_port._path_to_lighttpd() |
| 651 | 651 |
| 652 def _path_to_lighttpd_modules(self): | 652 def path_to_lighttpd_modules(self): |
| 653 return self._host_port._path_to_lighttpd_modules() | 653 return self._host_port._path_to_lighttpd_modules() |
| 654 | 654 |
| 655 def _path_to_lighttpd_php(self): | 655 def path_to_lighttpd_php(self): |
| 656 return self._host_port._path_to_lighttpd_php() | 656 return self._host_port._path_to_lighttpd_php() |
| 657 | 657 |
| 658 def _path_to_wdiff(self): | 658 def _path_to_wdiff(self): |
| 659 return self._host_port._path_to_wdiff() | 659 return self._host_port._path_to_wdiff() |
| 660 | 660 |
| 661 def _shut_down_http_server(self, pid): | 661 def _shut_down_http_server(self, pid): |
| 662 return self._host_port._shut_down_http_server(pid) | 662 return self._host_port._shut_down_http_server(pid) |
| 663 | 663 |
| 664 def _driver_class(self): | 664 def _driver_class(self): |
| 665 return ChromiumAndroidDriver | 665 return ChromiumAndroidDriver |
| (...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1277 return command | 1277 return command |
| 1278 | 1278 |
| 1279 def _read_prompt(self, deadline): | 1279 def _read_prompt(self, deadline): |
| 1280 last_char = '' | 1280 last_char = '' |
| 1281 while True: | 1281 while True: |
| 1282 current_char = self._server_process.read_stdout(deadline, 1) | 1282 current_char = self._server_process.read_stdout(deadline, 1) |
| 1283 if current_char == ' ': | 1283 if current_char == ' ': |
| 1284 if last_char in ('#', '$'): | 1284 if last_char in ('#', '$'): |
| 1285 return | 1285 return |
| 1286 last_char = current_char | 1286 last_char = current_char |
| OLD | NEW |