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

Fix+unskip flutter test expression eval tests (#26579)

Browse Source 
* Fix `flutter test`e xpression eval tests

We weren't passing `beforeStart` through so the breakpoints were never being set, which means the evaluations were happening while the code was running.

* Ensure we wait for breakpoints before trying to evaluate
This commit is contained in:
Danny Tuppeny 2019-01-15 15:39:35 +00:00 committed by GitHub
parent c713ef971e
commit fda193aa5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter_tools/test/integration/expression_evaluation_test.dart
View File

@ -102,6 +102,7 @@ void main() {
withDebugger: true, withDebugger: true,
beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine), beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine),
); );
await _flutter.waitForPause();
await evaluateTrivialExpressions(_flutter); await evaluateTrivialExpressions(_flutter);
}); });
@ -110,6 +111,7 @@ void main() {
withDebugger: true, withDebugger: true,
beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine), beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine),
); );
await _flutter.waitForPause();
await evaluateComplexExpressions(_flutter); await evaluateComplexExpressions(_flutter);
}); });
@ -118,10 +120,11 @@ void main() {
withDebugger: true, withDebugger: true,
beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine), beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine),
); );
await _flutter.waitForPause();
await evaluateComplexReturningExpressions(_flutter); await evaluateComplexReturningExpressions(_flutter);
}); });
// Skipped due to https://github.com/flutter/flutter/issues/26518 // Skipped due to https://github.com/flutter/flutter/issues/26518
}, timeout: const Timeout.factor(6), skip: true); }, timeout: const Timeout.factor(6));
} }
Future<void> evaluateTrivialExpressions(FlutterTestDriver flutter) async { Future<void> evaluateTrivialExpressions(FlutterTestDriver flutter) async {

2
packages/flutter_tools/test/integration/test_data/tests_project.dart
View File

@ -51,5 +51,5 @@ class TestsProject extends Project {
Uri get breakpointUri => Uri.file(testFilePath); Uri get breakpointUri => Uri.file(testFilePath);
@override @override
int get breakpointLine => lineContaining(main, '// BREAKPOINT'); int get breakpointLine => lineContaining(testContent, '// BREAKPOINT');
} }

2
packages/flutter_tools/test/integration/test_driver.dart
View File

@ -521,7 +521,7 @@ class FlutterTestTestDriver extends FlutterTestDriver {
'--machine', '--machine',
'-d', '-d',
'flutter-tester' 'flutter-tester'
], script: testFile, withDebugger: withDebugger, pauseOnExceptions: pauseOnExceptions, pidFile: pidFile); ], script: testFile, withDebugger: withDebugger, pauseOnExceptions: pauseOnExceptions, pidFile: pidFile, beforeStart: beforeStart);
} }
@override @override