Skip to content

Commit 771ec9b

Browse files
[ci] Enable LUCI Dart unit tests (#4378)
Enables the new LUCI Dart unit tests. There is no corresponding Cirrus removal because that test was accidentally removed early in #4352. Part of flutter/flutter#114373
1 parent 14d9a21 commit 771ec9b

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

.ci.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,29 +93,28 @@ targets:
9393
version_file: flutter_master.version
9494

9595
- name: Linux dart_unit_test_shard_1 master
96-
bringup: true # New target
9796
recipe: packages/packages
9897
timeout: 60
9998
properties:
99+
add_recipes_cq: "true"
100100
target_file: dart_unit_tests.yaml
101101
channel: master
102102
version_file: flutter_master.version
103103
cores: "32"
104104
package_sharding: "--shardIndex 0 --shardCount 2"
105105

106106
- name: Linux dart_unit_test_shard_2 master
107-
bringup: true # New target
108107
recipe: packages/packages
109108
timeout: 60
110109
properties:
110+
add_recipes_cq: "true"
111111
target_file: dart_unit_tests.yaml
112112
channel: master
113113
version_file: flutter_master.version
114114
cores: "32"
115115
package_sharding: "--shardIndex 1 --shardCount 2"
116116

117117
- name: Linux dart_unit_test_shard_1 stable
118-
bringup: true # New target
119118
recipe: packages/packages
120119
timeout: 60
121120
properties:
@@ -126,7 +125,6 @@ targets:
126125
package_sharding: "--shardIndex 0 --shardCount 2"
127126

128127
- name: Linux dart_unit_test_shard_2 stable
129-
bringup: true # New target
130128
recipe: packages/packages
131129
timeout: 60
132130
properties:
@@ -137,29 +135,28 @@ targets:
137135
package_sharding: "--shardIndex 1 --shardCount 2"
138136

139137
- name: Linux_web web_dart_unit_test_shard_1 master
140-
bringup: true # New target
141138
recipe: packages/packages
142139
timeout: 60
143140
properties:
141+
add_recipes_cq: "true"
144142
target_file: web_dart_unit_tests.yaml
145143
channel: master
146144
version_file: flutter_master.version
147145
cores: "32"
148146
package_sharding: "--shardIndex 0 --shardCount 2"
149147

150148
- name: Linux_web web_dart_unit_test_shard_2 master
151-
bringup: true # New target
152149
recipe: packages/packages
153150
timeout: 60
154151
properties:
152+
add_recipes_cq: "true"
155153
target_file: web_dart_unit_tests.yaml
156154
channel: master
157155
version_file: flutter_master.version
158156
cores: "32"
159157
package_sharding: "--shardIndex 1 --shardCount 2"
160158

161159
- name: Linux_web web_dart_unit_test_shard_1 stable
162-
bringup: true # New target
163160
recipe: packages/packages
164161
timeout: 60
165162
properties:
@@ -170,7 +167,6 @@ targets:
170167
package_sharding: "--shardIndex 0 --shardCount 2"
171168

172169
- name: Linux_web web_dart_unit_test_shard_2 stable
173-
bringup: true # New target
174170
recipe: packages/packages
175171
timeout: 60
176172
properties:

script/tool/lib/src/dart_test_command.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ class DartTestCommand extends PackageLoopingCommand {
118118
'test',
119119
'--color',
120120
if (experiment.isNotEmpty) '--enable-experiment=$experiment',
121-
if (platform != null) '--platform=$platform',
121+
// Flutter defaults to VM mode (under a different name) and explicitly
122+
// setting it is deprecated, so pass nothing in that case.
123+
if (platform != null && platform != 'vm') '--platform=$platform',
122124
],
123125
workingDir: package.directory,
124126
);

script/tool/test/dart_test_command_test.dart

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,24 @@ void main() {
231231
]));
232232
});
233233

234+
test('converts --platform=vm to no argument for flutter test', () async {
235+
final RepositoryPackage plugin = createFakePlugin(
236+
'some_plugin',
237+
packagesDir,
238+
extraFiles: <String>['test/empty_test.dart'],
239+
);
240+
241+
await runCapturingPrint(runner, <String>['dart-test', '--platform=vm']);
242+
243+
expect(
244+
processRunner.recordedCalls,
245+
orderedEquals(<ProcessCall>[
246+
ProcessCall(getFlutterCommand(mockPlatform),
247+
const <String>['test', '--color'], plugin.path),
248+
]),
249+
);
250+
});
251+
234252
test('runs in Chrome when requested for Flutter package', () async {
235253
final RepositoryPackage package = createFakePackage(
236254
'a_package',

0 commit comments

Comments
 (0)