Chromium Code Reviews Chromium Code Reviews
Issue 2392683003:
Remove TestWebKitPort from port_testcase. (Closed)
| 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 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 650 def _build_path(self, *comps): | 650 def _build_path(self, *comps): |
| 651 return self._host_port._build_path(*comps) | 651 return self._host_port._build_path(*comps) |
| 652 | 652 |
| 653 def _build_path_with_target(self, target, *comps): | 653 def _build_path_with_target(self, target, *comps): |
| 654 return self._host_port._build_path_with_target(target, *comps) | 654 return self._host_port._build_path_with_target(target, *comps) |
| 655 | 655 |
| 656 def path_to_apache(self): | 656 def path_to_apache(self): |
| 657 return self._host_port.path_to_apache() | 657 return self._host_port.path_to_apache() |
| 658 | 658 |
| 659 def path_to_apache_config_file(self): | 659 def path_to_apache_config_file(self): |
| 660 print self._host_port | |
|
Dirk Pranke
2016/10/06 17:48:58
is this change intentional?
qyearsley
2016/10/06 20:15:43
Nope! Now removed.
| |
| 660 return self._host_port.path_to_apache_config_file() | 661 return self._host_port.path_to_apache_config_file() |
| 661 | 662 |
| 662 def _path_to_driver(self, target=None): | 663 def _path_to_driver(self, target=None): |
| 663 return self._build_path_with_target(target, self._driver_details.apk_nam e()) | 664 return self._build_path_with_target(target, self._driver_details.apk_nam e()) |
| 664 | 665 |
| 665 def _path_to_helper(self): | 666 def _path_to_helper(self): |
| 666 return None | 667 return None |
| 667 | 668 |
| 668 def _path_to_image_diff(self): | 669 def _path_to_image_diff(self): |
| 669 return self._host_port._path_to_image_diff() | 670 return self._host_port._path_to_image_diff() |
| (...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1326 return command | 1327 return command |
| 1327 | 1328 |
| 1328 def _read_prompt(self, deadline): | 1329 def _read_prompt(self, deadline): |
| 1329 last_char = '' | 1330 last_char = '' |
| 1330 while True: | 1331 while True: |
| 1331 current_char = self._server_process.read_stdout(deadline, 1) | 1332 current_char = self._server_process.read_stdout(deadline, 1) |
| 1332 if current_char == ' ': | 1333 if current_char == ' ': |
| 1333 if last_char in ('#', '$'): | 1334 if last_char in ('#', '$'): |
| 1334 return | 1335 return |
| 1335 last_char = current_char | 1336 last_char = current_char |
| OLD | NEW |
