Skip to content

Commit d733bea

Browse files
authored
Add --no-web-resources-cdn to all web integration tests (flutter#171013)
Let's avoid downloading canvaskit from the CDN in our integration tests. Closes flutter#110879
1 parent 57f27a7 commit d733bea

12 files changed

+27
-11
lines changed

packages/flutter_tools/test/integration.shard/test_driver.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ final class FlutterRunTestDriver extends FlutterTestDriver {
548548
deviceArgs = <String>[
549549
GoogleChromeDevice.kChromeDeviceId,
550550
'--web-run-headless',
551+
'--no-web-resources-cdn',
551552
if (!expressionEvaluation) '--no-web-enable-expression-evaluation',
552553
];
553554
default:

packages/flutter_tools/test/web.shard/debugger_stepping_web_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void main() {
3131
withDebugger: true,
3232
startPaused: true,
3333
device: GoogleChromeDevice.kChromeDeviceId,
34-
additionalCommandArgs: <String>['--verbose'],
34+
additionalCommandArgs: <String>['--verbose', '--no-web-resources-cdn'],
3535
);
3636
await flutter.addBreakpoint(project.breakpointUri, project.breakpointLine);
3737
await flutter.resume(waitForNextPause: true); // Now we should be on the breakpoint.

packages/flutter_tools/test/web.shard/hot_reload_web_errors_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ import '../integration.shard/test_data/hot_reload_errors_common.dart';
99
import '../src/common.dart';
1010

1111
void main() {
12-
testAll(chrome: true, additionalCommandArgs: <String>['--web-experimental-hot-reload']);
12+
testAll(
13+
chrome: true,
14+
additionalCommandArgs: <String>['--web-experimental-hot-reload', '--no-web-resources-cdn'],
15+
);
1316
}

packages/flutter_tools/test/web.shard/hot_reload_web_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ import '../integration.shard/test_data/hot_reload_test_common.dart';
1010
import '../src/common.dart';
1111

1212
void main() {
13-
testAll(chrome: true, additionalCommandArgs: <String>['--web-experimental-hot-reload']);
13+
testAll(
14+
chrome: true,
15+
additionalCommandArgs: <String>['--web-experimental-hot-reload', '--no-web-resources-cdn'],
16+
);
1417
}

packages/flutter_tools/test/web.shard/hot_reload_with_asset_web_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ import '../integration.shard/test_data/hot_reload_with_asset_test_common.dart';
1010
import '../src/common.dart';
1111

1212
void main() {
13-
testAll(chrome: true, additionalCommandArgs: <String>['--web-experimental-hot-reload']);
13+
testAll(
14+
chrome: true,
15+
additionalCommandArgs: <String>['--web-experimental-hot-reload', '--no-web-resources-cdn'],
16+
);
1417
}

packages/flutter_tools/test/web.shard/output_web_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void main() {
3737
await flutter.run(
3838
withDebugger: true,
3939
device: GoogleChromeDevice.kChromeDeviceId,
40-
additionalCommandArgs: <String>[if (verbose) '--verbose'],
40+
additionalCommandArgs: <String>[if (verbose) '--verbose', '--no-web-resources-cdn'],
4141
);
4242
}
4343

packages/flutter_tools/test/web.shard/stateless_stateful_hot_reload_web_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ import '../integration.shard/test_data/stateless_stateful_hot_reload_test_common
1010
import '../src/common.dart';
1111

1212
void main() {
13-
testAll(chrome: true, additionalCommandArgs: <String>['--web-experimental-hot-reload']);
13+
testAll(
14+
chrome: true,
15+
additionalCommandArgs: <String>['--web-experimental-hot-reload', '--no-web-resources-cdn'],
16+
);
1417
}

packages/flutter_tools/test/web.shard/test_data/expression_evaluation_web_common.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Future<void> testAll({required bool useDDCLibraryBundleFormat}) async {
4545
expressionEvaluation: expressionEvaluation,
4646
additionalCommandArgs: <String>[
4747
'--verbose',
48+
'--no-web-resources-cdn',
4849
if (useDDCLibraryBundleFormat)
4950
'--web-experimental-hot-reload'
5051
else
@@ -139,6 +140,7 @@ Future<void> testAll({required bool useDDCLibraryBundleFormat}) async {
139140
script: project.testFilePath,
140141
additionalCommandArgs: <String>[
141142
'--verbose',
143+
'--no-web-resources-cdn',
142144
if (useDDCLibraryBundleFormat)
143145
'--web-experimental-hot-reload'
144146
else

packages/flutter_tools/test/web.shard/test_data/hot_restart_web_test_common.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Future<void> _testProject(
9191
device: GoogleChromeDevice.kChromeDeviceId,
9292
additionalCommandArgs: <String>[
9393
'--verbose',
94+
'--no-web-resources-cdn',
9495
if (useDDCLibraryBundleFormat)
9596
'--web-experimental-hot-reload'
9697
else

packages/flutter_tools/test/web.shard/vm_service_web_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void main() {
4040
await flutter.run(
4141
withDebugger: true,
4242
device: GoogleChromeDevice.kChromeDeviceId,
43-
additionalCommandArgs: <String>['--verbose'],
43+
additionalCommandArgs: <String>['--verbose', '--no-web-resources-cdn'],
4444
);
4545

4646
expect(flutter.vmServiceWsUri, isNotNull);
@@ -53,7 +53,7 @@ void main() {
5353
await flutter.run(
5454
withDebugger: true,
5555
device: GoogleChromeDevice.kChromeDeviceId,
56-
additionalCommandArgs: <String>['--verbose'],
56+
additionalCommandArgs: <String>['--verbose', '--no-web-resources-cdn'],
5757
);
5858

5959
expect(flutter.vmServiceWsUri, isNotNull);
@@ -85,7 +85,7 @@ void main() {
8585
await flutter.run(
8686
withDebugger: true,
8787
device: GoogleChromeDevice.kChromeDeviceId,
88-
additionalCommandArgs: <String>['--verbose'],
88+
additionalCommandArgs: <String>['--verbose', '--no-web-resources-cdn'],
8989
);
9090

9191
expect(flutter.vmServiceWsUri, isNotNull);

0 commit comments

Comments
 (0)