firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_tools] add working directory to ProcessException when pub get fails (#91436)

Browse Source
This commit is contained in:
Christopher Fujino 2021-10-07 18:08:04 -07:00 committed by GitHub
parent e1efeb3100
commit f753168cb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/flutter_tools/lib/src/dart/pub.dart
View File

@ -263,6 +263,25 @@ class _DefaultPub implements Pub {
// The exception is rethrown, so don't catch only Exceptions.
} catch (exception) { // ignore: avoid_catches_without_on_clauses
status?.cancel();
if (exception is io.ProcessException) {
final StringBuffer buffer = StringBuffer(exception.message);
buffer.writeln('Working directory: "$directory"');
final Map<String, String> env = await _createPubEnvironment(context, flutterRootOverride);
if (env.entries.isNotEmpty) {
buffer.writeln('pub env: {');
for (final MapEntry<String, String> entry in env.entries) {
buffer.writeln(' "${entry.key}": "${entry.value}",');
}
buffer.writeln('}');
}
throw io.ProcessException(
exception.executable,
exception.arguments,
buffer.toString(),
exception.errorCode,
);
}
rethrow;
}

63
packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
View File

@ -8,6 +8,7 @@ import 'package:file/memory.dart';
import 'package:flutter_tools/src/base/bot_detector.dart';
import 'package:flutter_tools/src/base/common.dart';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/io.dart' show ProcessException;
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/cache.dart';
@ -688,6 +689,68 @@ void main() {
expect(processManager, hasNoRemainingExpectations);
});
testWithoutContext('pub get shows working directory on process exception', () async {
final BufferLogger logger = BufferLogger.test();
final FileSystem fileSystem = MemoryFileSystem.test();
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: const <String>[
'bin/cache/dart-sdk/bin/dart',
'__deprecated_pub',
'--verbosity=warning',
'get',
'--no-precompile',
],
onRun: () {
throw const ProcessException(
'bin/cache/dart-sdk/bin/dart',
<String>[
'__deprecated_pub',
'--verbosity=warning',
'get',
'--no-precompile',
],
'message',
1,
);
},
exitCode: 66,
stderr: 'err1\nerr2\nerr3\n',
stdout: 'out1\nout2\nout3\n',
environment: const <String, String>{'FLUTTER_ROOT': '', 'PUB_ENVIRONMENT': 'flutter_cli:flutter_tests'},
),
]);
final Pub pub = Pub(
platform: FakePlatform(environment: const <String, String>{}),
fileSystem: fileSystem,
logger: logger,
usage: TestUsage(),
botDetector: const BotDetectorAlwaysNo(),
processManager: processManager,
);
await expectLater(
() => pub.get(context: PubContext.flutterTests),
throwsA(
isA<ProcessException>().having(
(ProcessException error) => error.message,
'message',
contains('Working directory: "/"'),
).having(
(ProcessException error) => error.message,
'message',
contains('"PUB_ENVIRONMENT": "flutter_cli:flutter_tests"'),
),
),
);
expect(logger.statusText,
'Running "flutter pub get" in /...\n'
);
expect(logger.errorText, isEmpty);
expect(processManager, hasNoRemainingExpectations);
});
testWithoutContext('pub cache in root is used', () async {
String? error;
final FileSystem fileSystem = MemoryFileSystem.test();