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

Fix Linux_android_emu tests late initialization errors (#152932)

Browse Source 
This does not fix the issue underlying
https://github.com/flutter/flutter/issues/152684, but may prevent `adb
logcat` from ending before we've captured the logs that explain why the
app or emulator are potentially crashing.

Fixes Fixes https://github.com/flutter/flutter/issues/152899
This commit is contained in:
Zachary Anderson 2024-08-06 14:48:50 -07:00 committed by GitHub
parent 521b0b327c
commit c4e19962bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev/integration_tests/android_driver_test/test_driver/main_test.dart
View File

@ -24,8 +24,8 @@ Future<void> _main() async {
// To generate golden files locally, uncomment the following line. // To generate golden files locally, uncomment the following line.
// autoUpdateGoldenFiles = true; // autoUpdateGoldenFiles = true;
late FlutterDriver flutterDriver; FlutterDriver? flutterDriver;
late NativeDriver nativeDriver; NativeDriver? nativeDriver;
setUpAll(() async { setUpAll(() async {
flutterDriver = await FlutterDriver.connect( flutterDriver = await FlutterDriver.connect(
@ -38,14 +38,14 @@ Future<void> _main() async {
}); });
tearDownAll(() async { tearDownAll(() async {
await nativeDriver.close(); await nativeDriver?.close();
await flutterDriver.close(); await flutterDriver?.close();
}); });
test('should screenshot and match a full-screen blue rectangle', () async { test('should screenshot and match a full-screen blue rectangle', () async {
await flutterDriver.waitFor(find.byType('DecoratedBox')); await flutterDriver?.waitFor(find.byType('DecoratedBox'));
await expectLater( await expectLater(
nativeDriver.screenshot(), nativeDriver?.screenshot(),
matchesGoldenFile('android_driver_test.BlueRectangle.png'), matchesGoldenFile('android_driver_test.BlueRectangle.png'),
); );
}, timeout: Timeout.none); }, timeout: Timeout.none);

36
dev/integration_tests/android_views/test_driver/main_test.dart
View File

@ -6,14 +6,14 @@ import 'package:flutter_driver/flutter_driver.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
Future<void> main() async { Future<void> main() async {
late FlutterDriver driver; FlutterDriver? driver;
setUpAll(() async { setUpAll(() async {
driver = await FlutterDriver.connect(); driver = await FlutterDriver.connect();
}); });
tearDownAll(() { tearDownAll(() {
driver.close(); driver?.close();
}); });
// Each test below must return back to the home page after finishing. // Each test below must return back to the home page after finishing.
@ -21,14 +21,14 @@ Future<void> main() async {
test('MotionEvent recomposition', () async { test('MotionEvent recomposition', () async {
final SerializableFinder motionEventsListTile = final SerializableFinder motionEventsListTile =
find.byValueKey('MotionEventsListTile'); find.byValueKey('MotionEventsListTile');
await driver.tap(motionEventsListTile); await driver?.tap(motionEventsListTile);
await driver.runUnsynchronized(() async { await driver?.runUnsynchronized(() async {
driver.waitFor(find.byValueKey('PlatformView')); driver?.waitFor(find.byValueKey('PlatformView'));
}); });
final String errorMessage = await driver.requestData('run test'); final String errorMessage = (await driver?.requestData('run test'))!;
expect(errorMessage, ''); expect(errorMessage, '');
final SerializableFinder backButton = find.byValueKey('back'); final SerializableFinder backButton = find.byValueKey('back');
await driver.tap(backButton); await driver?.tap(backButton);
}, timeout: Timeout.none); }, timeout: Timeout.none);
group('WindowManager', () group('WindowManager', ()
@ -36,32 +36,32 @@ Future<void> main() async {
setUpAll(() async { setUpAll(() async {
final SerializableFinder wmListTile = final SerializableFinder wmListTile =
find.byValueKey('WmIntegrationsListTile'); find.byValueKey('WmIntegrationsListTile');
await driver.tap(wmListTile); await driver?.tap(wmListTile);
}); });
tearDownAll(() async { tearDownAll(() async {
await driver.waitFor(find.pageBack()); await driver?.waitFor(find.pageBack());
await driver.tap(find.pageBack()); await driver?.tap(find.pageBack());
}); });
test('AlertDialog from platform view context', () async { test('AlertDialog from platform view context', () async {
final SerializableFinder showAlertDialog = find.byValueKey( final SerializableFinder showAlertDialog = find.byValueKey(
'ShowAlertDialog'); 'ShowAlertDialog');
await driver.waitFor(showAlertDialog); await driver?.waitFor(showAlertDialog);
await driver.tap(showAlertDialog); await driver?.tap(showAlertDialog);
final String status = await driver.getText(find.byValueKey('Status')); final String status = (await driver?.getText(find.byValueKey('Status')))!;
expect(status, 'Success'); expect(status, 'Success');
}, timeout: Timeout.none); }, timeout: Timeout.none);
test('Child windows can handle touches', () async { test('Child windows can handle touches', () async {
final SerializableFinder addWindow = find.byValueKey('AddWindow'); final SerializableFinder addWindow = find.byValueKey('AddWindow');
await driver.waitFor(addWindow); await driver?.waitFor(addWindow);
await driver.tap(addWindow); await driver?.tap(addWindow);
final SerializableFinder tapWindow = find.byValueKey('TapWindow'); final SerializableFinder tapWindow = find.byValueKey('TapWindow');
await driver.tap(tapWindow); await driver?.tap(tapWindow);
final String windowClickCount = await driver.getText( final String windowClickCount = (await driver?.getText(
find.byValueKey('WindowClickCount'), find.byValueKey('WindowClickCount'),
); ))!;
expect(windowClickCount, 'Click count: 1'); expect(windowClickCount, 'Click count: 1');
}, timeout: Timeout.none, skip: true); // TODO(garyq): Skipped, see https://github.com/flutter/flutter/issues/88479 }, timeout: Timeout.none, skip: true); // TODO(garyq): Skipped, see https://github.com/flutter/flutter/issues/88479
}); });

20
dev/integration_tests/external_textures/test_driver/frame_rate_main_test.dart
View File

@ -12,14 +12,14 @@ final RegExp _statsRegExp = RegExp('Produced: (.*)fps\nConsumed: (.*)fps\nWidget
const Duration _samplingTime = Duration(seconds: 8); const Duration _samplingTime = Duration(seconds: 8);
Future<void> main() async { Future<void> main() async {
late final FlutterDriver driver; FlutterDriver? driver;
setUpAll(() async { setUpAll(() async {
driver = await FlutterDriver.connect(); driver = await FlutterDriver.connect();
}); });
tearDownAll(() async { tearDownAll(() async {
await driver.close(); await driver?.close();
}); });
// Verifies we consume texture frames at a rate close to the minimum of the // Verifies we consume texture frames at a rate close to the minimum of the
@ -31,19 +31,19 @@ Future<void> main() async {
final SerializableFinder summary = find.byValueKey('summary'); final SerializableFinder summary = find.byValueKey('summary');
// Wait for calibration to complete and fab to appear. // Wait for calibration to complete and fab to appear.
await driver.waitFor(fab); await driver?.waitFor(fab);
final String calibrationResult = await driver.getText(summary); final String calibrationResult = (await driver?.getText(summary))!;
final Match? matchCalibration = _calibrationRegExp.matchAsPrefix(calibrationResult); final Match? matchCalibration = _calibrationRegExp.matchAsPrefix(calibrationResult);
expect(matchCalibration, isNotNull); expect(matchCalibration, isNotNull);
final double flutterFrameRate = double.parse(matchCalibration?.group(1) ?? '0'); final double flutterFrameRate = double.parse(matchCalibration?.group(1) ?? '0');
// Texture frame stats at 0.5x Flutter frame rate // Texture frame stats at 0.5x Flutter frame rate
await driver.tap(fab); await driver?.tap(fab);
await Future<void>.delayed(_samplingTime); await Future<void>.delayed(_samplingTime);
await driver.tap(fab); await driver?.tap(fab);
final String statsSlow = await driver.getText(summary); final String statsSlow = (await driver?.getText(summary))!;
final Match matchSlow = _statsRegExp.matchAsPrefix(statsSlow)!; final Match matchSlow = _statsRegExp.matchAsPrefix(statsSlow)!;
expect(matchSlow, isNotNull); expect(matchSlow, isNotNull);
@ -55,11 +55,11 @@ Future<void> main() async {
expect(widgetBuilds, 1); expect(widgetBuilds, 1);
// Texture frame stats at 2.0x Flutter frame rate // Texture frame stats at 2.0x Flutter frame rate
await driver.tap(fab); await driver?.tap(fab);
await Future<void>.delayed(_samplingTime); await Future<void>.delayed(_samplingTime);
await driver.tap(fab); await driver?.tap(fab);
final String statsFast = await driver.getText(summary); final String statsFast = (await driver?.getText(summary))!;
final Match matchFast = _statsRegExp.matchAsPrefix(statsFast)!; final Match matchFast = _statsRegExp.matchAsPrefix(statsFast)!;
expect(matchFast, isNotNull); expect(matchFast, isNotNull);

6
dev/integration_tests/ui/test_driver/defines_test.dart
View File

@ -6,17 +6,17 @@ import 'package:flutter_driver/flutter_driver.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf; import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
void main() { void main() {
late FlutterDriver driver; FlutterDriver? driver;
setUpAll(() async { setUpAll(() async {
driver = await FlutterDriver.connect(); driver = await FlutterDriver.connect();
}); });
tearDownAll(() async { tearDownAll(() async {
await driver.close(); await driver?.close();
}); });
test('Can run with --dart-define', () async { test('Can run with --dart-define', () async {
await driver.waitFor(find.text('Example,AValue')); await driver?.waitFor(find.text('Example,AValue'));
}, timeout: Timeout.none); }, timeout: Timeout.none);
} }

2
packages/flutter_driver/lib/src/driver/vmservice_driver.dart
View File

@ -109,8 +109,10 @@ class VMServiceFlutterDriver extends FlutterDriver {
while (true) { while (true) {
final vms.Isolate isolate = await client.getIsolate(ref.id!); final vms.Isolate isolate = await client.getIsolate(ref.id!);
if (isolate.pauseEvent!.kind == vms.EventKind.kNone) { if (isolate.pauseEvent!.kind == vms.EventKind.kNone) {
_log('Waiting for isolate ${ref.number} to be runnable.');
await Future<void>.delayed(_kPauseBetweenIsolateRefresh); await Future<void>.delayed(_kPauseBetweenIsolateRefresh);
} else { } else {
_log('Isolate ${ref.number} is runnable.');
return isolate; return isolate;
} }
} }