third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py - Issue 2399613002: Don't access Port._filesystem directly (use Port.host.filesystem instead).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2399613002: Don't access Port._filesystem directly (use Port.host.filesystem instead). (Closed)

Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

index d89fb0091a98d89d858ad5ded873f7ec90a5f9d2..63ba31e1c51109345744363c40af4d543b7206db 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

@@ -1290,7 +1290,8 @@ class ChromiumAndroidDriver(driver.Driver):

dumps = self._android_commands.run(['shell', 'ls', self._driver_details.device_crash_dumps_directory()])

for dump in dumps.splitlines():

device_dump = '%s/%s' % (self._driver_details.device_crash_dumps_directory(), dump)

- local_dump = self._port._filesystem.join(self._port._dump_reader.crash_dumps_directory(), dump)

+ local_dump = self._port.host.filesystem.join(

+ self._port._dump_reader.crash_dumps_directory(), dump) # pylint: disable=protected-access

# FIXME: crbug.com/321489. Figure out why these commands would fail ...

err = self._android_commands.run(['shell', 'chmod', '777', device_dump])

@@ -1299,7 +1300,7 @@ class ChromiumAndroidDriver(driver.Driver):

if not err:

self._android_commands.run(['shell', 'rm', '-f', device_dump])

- if self._port._filesystem.exists(local_dump):

+ if self._port.host.filesystem.exists(local_dump):

result.append(local_dump)

return result

@@ -1318,7 +1319,7 @@ class ChromiumAndroidDriver(driver.Driver):

def _command_from_driver_input(self, driver_input):

command = super(ChromiumAndroidDriver, self)._command_from_driver_input(driver_input)

if command.startswith('/'):

- fs = self._port._filesystem

+ fs = self._port.host.filesystem

# FIXME: what happens if command lies outside of the layout_tests_dir on the host?

relative_test_filename = fs.relpath(command, fs.dirname(self._port.layout_tests_dir()))

command = DEVICE_WEBKIT_BASE_DIR + relative_test_filename