Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

Issue 1913533002: [blink] Resolve symlinks in host binary paths in android layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 self._device_serial = device_serial 200 self._device_serial = device_serial
201 self._debug_logging = debug_logging 201 self._debug_logging = debug_logging
202 202
203 # Local public methods. 203 # Local public methods.
204 204
205 def file_exists(self, full_path): 205 def file_exists(self, full_path):
206 assert full_path.startswith('/') 206 assert full_path.startswith('/')
207 return self.run(['shell', 'ls', '-d', full_path]).strip() == full_path 207 return self.run(['shell', 'ls', '-d', full_path]).strip() == full_path
208 208
209 def push(self, host_path, device_path, ignore_error=False): 209 def push(self, host_path, device_path, ignore_error=False):
210 return self.run(['push', host_path, device_path], ignore_error=ignore_er ror) 210 return self.run(['push', os.path.realpath(host_path), device_path],
211 ignore_error=ignore_error)
211 212
212 def pull(self, device_path, host_path, ignore_error=False): 213 def pull(self, device_path, host_path, ignore_error=False):
213 return self.run(['pull', device_path, host_path], ignore_error=ignore_er ror) 214 return self.run(['pull', device_path, host_path], ignore_error=ignore_er ror)
214 215
215 def mkdir(self, device_path, chmod=None): 216 def mkdir(self, device_path, chmod=None):
216 self.run(['shell', 'mkdir', '-p', device_path]) 217 self.run(['shell', 'mkdir', '-p', device_path])
217 if chmod: 218 if chmod:
218 self.run(['shell', 'chmod', chmod, device_path]) 219 self.run(['shell', 'chmod', chmod, device_path])
219 220
220 def restart_adb(self): 221 def restart_adb(self):
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 return command 1302 return command
1302 1303
1303 def _read_prompt(self, deadline): 1304 def _read_prompt(self, deadline):
1304 last_char = '' 1305 last_char = ''
1305 while True: 1306 while True:
1306 current_char = self._server_process.read_stdout(deadline, 1) 1307 current_char = self._server_process.read_stdout(deadline, 1)
1307 if current_char == ' ': 1308 if current_char == ' ':
1308 if last_char in ('#', '$'): 1309 if last_char in ('#', '$'):
1309 return 1310 return
1310 last_char = current_char 1311 last_char = current_char
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698