Unverified Commit a3f6ea6f authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] split web integration tests into new shard (#69914)

parent a1a096e3
...@@ -320,7 +320,7 @@ Future<void> _runToolTests() async { ...@@ -320,7 +320,7 @@ Future<void> _runToolTests() async {
Directory(path.join(toolsPath, kTest)) Directory(path.join(toolsPath, kTest))
.listSync() .listSync()
.map<String>((FileSystemEntity entry) => entry.path) .map<String>((FileSystemEntity entry) => entry.path)
.where((String name) => name.endsWith(kDotShard)) .where((String name) => name.endsWith(kDotShard) && !name.contains('web'))
.map<String>((String name) => path.basenameWithoutExtension(name)), .map<String>((String name) => path.basenameWithoutExtension(name)),
// The `dynamic` on the next line is because Map.fromIterable isn't generic. // The `dynamic` on the next line is because Map.fromIterable isn't generic.
value: (dynamic subshard) => () async { value: (dynamic subshard) => () async {
......
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
import 'package:file/file.dart'; import 'package:file/file.dart';
import 'package:matcher/matcher.dart'; import 'package:matcher/matcher.dart';
import 'package:vm_service/vm_service.dart'; import 'package:vm_service/vm_service.dart';
import '../integration.shard/test_data/basic_project.dart';
import '../integration.shard/test_data/tests_project.dart';
import '../integration.shard/test_driver.dart';
import '../integration.shard/test_utils.dart';
import '../src/common.dart'; import '../src/common.dart';
import 'test_data/basic_project.dart';
import 'test_data/tests_project.dart';
import 'test_driver.dart';
import 'test_utils.dart';
void batch1() { void batch1() {
final BasicProject _project = BasicProject(); final BasicProject _project = BasicProject();
...@@ -57,7 +56,7 @@ void batch1() { ...@@ -57,7 +56,7 @@ void batch1() {
await breakInTopLevelFunction(_flutter); await breakInTopLevelFunction(_flutter);
await failToEvaluateExpression(_flutter); await failToEvaluateExpression(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter run expression evaluation - no native javascript objects in static scope', () async { testWithoutContext('flutter run expression evaluation - no native javascript objects in static scope', () async {
await initProject(); await initProject();
...@@ -65,7 +64,7 @@ void batch1() { ...@@ -65,7 +64,7 @@ void batch1() {
await breakInTopLevelFunction(_flutter); await breakInTopLevelFunction(_flutter);
await checkStaticScope(_flutter); await checkStaticScope(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter run expression evaluation - can handle compilation errors', () async { testWithoutContext('flutter run expression evaluation - can handle compilation errors', () async {
await initProject(); await initProject();
...@@ -73,7 +72,7 @@ void batch1() { ...@@ -73,7 +72,7 @@ void batch1() {
await breakInTopLevelFunction(_flutter); await breakInTopLevelFunction(_flutter);
await evaluateErrorExpressions(_flutter); await evaluateErrorExpressions(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter run expression evaluation - can evaluate trivial expressions in top level function', () async { testWithoutContext('flutter run expression evaluation - can evaluate trivial expressions in top level function', () async {
await initProject(); await initProject();
...@@ -81,7 +80,7 @@ void batch1() { ...@@ -81,7 +80,7 @@ void batch1() {
await breakInTopLevelFunction(_flutter); await breakInTopLevelFunction(_flutter);
await evaluateTrivialExpressions(_flutter); await evaluateTrivialExpressions(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter run expression evaluation - can evaluate trivial expressions in build method', () async { testWithoutContext('flutter run expression evaluation - can evaluate trivial expressions in build method', () async {
await initProject(); await initProject();
...@@ -89,7 +88,7 @@ void batch1() { ...@@ -89,7 +88,7 @@ void batch1() {
await breakInBuildMethod(_flutter); await breakInBuildMethod(_flutter);
await evaluateTrivialExpressions(_flutter); await evaluateTrivialExpressions(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter run expression evaluation - can evaluate complex expressions in top level function', () async { testWithoutContext('flutter run expression evaluation - can evaluate complex expressions in top level function', () async {
await initProject(); await initProject();
...@@ -97,7 +96,7 @@ void batch1() { ...@@ -97,7 +96,7 @@ void batch1() {
await breakInTopLevelFunction(_flutter); await breakInTopLevelFunction(_flutter);
await evaluateComplexExpressions(_flutter); await evaluateComplexExpressions(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter run expression evaluation - can evaluate complex expressions in build method', () async { testWithoutContext('flutter run expression evaluation - can evaluate complex expressions in build method', () async {
await initProject(); await initProject();
...@@ -105,7 +104,7 @@ void batch1() { ...@@ -105,7 +104,7 @@ void batch1() {
await breakInBuildMethod(_flutter); await breakInBuildMethod(_flutter);
await evaluateComplexExpressions(_flutter); await evaluateComplexExpressions(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
} }
void batch2() { void batch2() {
...@@ -149,7 +148,7 @@ void batch2() { ...@@ -149,7 +148,7 @@ void batch2() {
await breakInMethod(_flutter); await breakInMethod(_flutter);
await failToEvaluateExpression(_flutter); await failToEvaluateExpression(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter test expression evaluation - can evaluate trivial expressions in a test', () async { testWithoutContext('flutter test expression evaluation - can evaluate trivial expressions in a test', () async {
await initProject(); await initProject();
...@@ -157,7 +156,7 @@ void batch2() { ...@@ -157,7 +156,7 @@ void batch2() {
await breakInMethod(_flutter); await breakInMethod(_flutter);
await evaluateTrivialExpressions(_flutter); await evaluateTrivialExpressions(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
testWithoutContext('flutter test expression evaluation - can evaluate complex expressions in a test', () async { testWithoutContext('flutter test expression evaluation - can evaluate complex expressions in a test', () async {
await initProject(); await initProject();
...@@ -165,7 +164,7 @@ void batch2() { ...@@ -165,7 +164,7 @@ void batch2() {
await breakInMethod(_flutter); await breakInMethod(_flutter);
await evaluateComplexExpressions(_flutter); await evaluateComplexExpressions(_flutter);
await cleanProject(); await cleanProject();
}, skip: 'Cannot run on non-web-bot'); // Issue: https://github.com/flutter/flutter/issues/69711 });
} }
Future<void> failToEvaluateExpression(FlutterTestDriver flutter) async { Future<void> failToEvaluateExpression(FlutterTestDriver flutter) async {
......
...@@ -6,10 +6,10 @@ import 'dart:async'; ...@@ -6,10 +6,10 @@ import 'dart:async';
import 'package:file/file.dart'; import 'package:file/file.dart';
import '../integration.shard/test_data/hot_reload_project.dart';
import '../integration.shard/test_driver.dart';
import '../integration.shard/test_utils.dart';
import '../src/common.dart'; import '../src/common.dart';
import 'test_data/hot_reload_project.dart';
import 'test_driver.dart';
import 'test_utils.dart';
void main() { void main() {
Directory tempDir; Directory tempDir;
...@@ -30,7 +30,7 @@ void main() { ...@@ -30,7 +30,7 @@ void main() {
testWithoutContext('hot restart works without error', () async { testWithoutContext('hot restart works without error', () async {
await flutter.run(chrome: true); await flutter.run(chrome: true);
await flutter.hotRestart(); await flutter.hotRestart();
}, skip: true); // TODO(jonahwilliams): https://github.com/flutter/flutter/issues/69804 });
testWithoutContext('newly added code executes during hot restart', () async { testWithoutContext('newly added code executes during hot restart', () async {
final Completer<void> completer = Completer<void>(); final Completer<void> completer = Completer<void>();
...@@ -48,7 +48,7 @@ void main() { ...@@ -48,7 +48,7 @@ void main() {
} finally { } finally {
await subscription.cancel(); await subscription.cancel();
} }
}, skip: true); // TODO(jonahwilliams): https://github.com/flutter/flutter/issues/69804 });
testWithoutContext('newly added code executes during hot restart - canvaskit', () async { testWithoutContext('newly added code executes during hot restart - canvaskit', () async {
final Completer<void> completer = Completer<void>(); final Completer<void> completer = Completer<void>();
...@@ -66,5 +66,5 @@ void main() { ...@@ -66,5 +66,5 @@ void main() {
} finally { } finally {
await subscription.cancel(); await subscription.cancel();
} }
}, skip: true); // TODO(jonahwilliams): https://github.com/flutter/flutter/issues/69804 });
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment