development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-12 19:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race causing null dereference on getStack in web_tool_tests and CI flakes (#87278)

Browse source
This commit is contained in:
Anna Gringauze 2021-07-29 16:59:02 -07:00 committed by GitHub
parent 26c30fe2e3
commit 33fd4f15a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/flutter_tools/test/integration.shard/test_driver.dart
View file

@ -250,17 +250,20 @@ abstract class FlutterTestDriver {
// This method isn't racy. If the isolate is already paused,
// it will immediately return.
Future<Isolate> waitForPause() async {
Future<Isolate> waitForPause() => waitForDebugEvent('Pause');
Future<Isolate> waitForResume() => waitForDebugEvent('Resume');
Future<Isolate> waitForDebugEvent(String kind) async {
return _timeoutWithMessages<Isolate>(
() async {
final String flutterIsolate = await _getFlutterIsolateId();
final Completer<Event> pauseEvent = Completer<Event>();
// Start listening for pause events.
// Start listening for events containing 'kind'.
final StreamSubscription<Event> pauseSubscription = _vmService.onDebugEvent
.where((Event event) {
return event.isolate.id == flutterIsolate
&& event.kind.startsWith('Pause');
&& event.kind.startsWith(kind);
})
.listen((Event event) {
if (!pauseEvent.isCompleted) {
@ -268,14 +271,14 @@ abstract class FlutterTestDriver {
}
});
// But also check if the isolate was already paused (only after we've set
// up the subscription) to avoid races. If it was paused, we don't need to wait
// But also check if the isolate was already at the stae we need (only after we've
// set up the subscription) to avoid races. If it was paused, we don't need to wait
// for the event.
final Isolate isolate = await _vmService.getIsolate(flutterIsolate);
if (isolate.pauseEvent.kind.startsWith('Pause')) {
_debugPrint('Isolate was already paused (${isolate.pauseEvent.kind}).');
if (isolate.pauseEvent.kind.startsWith(kind)) {
_debugPrint('Isolate was already at "$kind" (${isolate.pauseEvent.kind}).');
} else {
_debugPrint('Isolate is not already paused, waiting for event to arrive...');
_debugPrint('Waiting for "$kind" event to arrive...');
await pauseEvent.future;
}
@ -284,7 +287,7 @@ abstract class FlutterTestDriver {
return getFlutterIsolate();
},
task: 'Waiting for isolate to pause',
task: 'Waiting for isolate to $kind',
);
}
@ -312,6 +315,7 @@ abstract class FlutterTestDriver {
() async => _vmService.resume(await _getFlutterIsolateId(), step: step),
task: 'Resuming isolate (step=$step)',
);
await waitForResume();
return waitForNextPause ? waitForPause() : null;
}

2
packages/flutter_tools/test/web.shard/expression_evaluation_web_test.dart
View file

@ -174,7 +174,7 @@ void main() {
Future<void> failToEvaluateExpression(FlutterTestDriver flutter) async {
await expectLater(
() => flutter.evaluateInFrame('"test"'),
flutter.evaluateInFrame('"test"'),
throwsA(isA<RPCError>().having(
(RPCError error) => error.message,
'message',