github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_tools] catch errors when getting cwd (#74744)

Browse Source
This commit is contained in:
Jonah Williams 2021-01-26 12:49:03 -08:00 committed by GitHub
parent 384b4d1b83
commit fa8bf67cb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter_tools/lib/src/base/error_handling_io.dart
View File

@ -102,7 +102,9 @@ class ErrorHandlingFileSystem extends ForwardingFileSystem {
static bool _noExitOnFailure = false;
@override
Directory get currentDirectory => directory(delegate.currentDirectory);
Directory get currentDirectory {
return _runSync(() => directory(delegate.currentDirectory), platform: _platform);
}
@override
File file(dynamic path) => ErrorHandlingFile(
@ -710,7 +712,7 @@ void _handleWindowsException(Exception e, String message, int errorCode) {
switch (errorCode) {
case kAccessDenied:
errorMessage =
'$message. The flutter tool cannot access the file.\n'
'$message. The flutter tool cannot access the file or directory.\n'
'Please ensure that the SDK and/or project is installed in a location '
'that has read/write permissions for the current user.';
break;

9
packages/flutter_tools/test/general.shard/base/error_handling_io_test.dart
View File

@ -87,6 +87,7 @@ void setupReadMocks({
}) {
final MockFile mockFile = MockFile();
when(mockFileSystem.file(any)).thenReturn(mockFile);
when(mockFileSystem.currentDirectory).thenThrow(FileSystemException('', '', OSError('', errorCode)));
when(mockFile.readAsStringSync(
encoding: anyNamed('encoding'),
)).thenThrow(FileSystemException('', '', OSError('', errorCode)));
@ -345,7 +346,7 @@ void main() {
throwsToolExit(message: expectedMessage));
});
testWithoutContext('When reading from a file without permission', () {
testWithoutContext('When reading from a file or directory without permission', () {
setupReadMocks(
mockFileSystem: mockFileSystem,
fs: fs,
@ -357,6 +358,8 @@ void main() {
const String expectedMessage = 'Flutter failed to read a file at';
expect(() => file.readAsStringSync(),
throwsToolExit(message: expectedMessage));
expect(() => fs.currentDirectory,
throwsToolExit(message: 'The flutter tool cannot access the file or directory'));
});
});
@ -579,7 +582,7 @@ void main() {
throwsToolExit(message: expectedMessage));
});
testWithoutContext('When reading from a file without permission', () {
testWithoutContext('When reading from a file or directory without permission', () {
setupReadMocks(
mockFileSystem: mockFileSystem,
fs: fs,
@ -591,6 +594,8 @@ void main() {
const String expectedMessage = 'Flutter failed to read a file at';
expect(() => file.readAsStringSync(),
throwsToolExit(message: expectedMessage));
expect(() => fs.currentDirectory,
throwsToolExit(message: 'The flutter tool cannot access the file or directory'));
});
});