github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts "Try running historically flaky tests first to make flutter build apk health tests time out more often? (#158967)" (#158993)

Browse Source 
Reverts: flutter/flutter#158967
Initiated by: matanlurey
Reason for reverting: `--run-skipped` doesn't work in this repository (https://github.com/flutter/flutter/issues/158972).
Original PR Author: matanlurey

Reviewed By: {andrewkolos}

This change reverts the following previous change:
I have no idea if this will work, but `6_6` is currently the suite that seems to have the most problems.

Towards https://github.com/flutter/flutter/issues/158560.
This commit is contained in:
auto-submit[bot] 2024-11-15 19:05:47 +00:00 committed by GitHub
parent 09941e7b47
commit 32133ce7ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dev/bots/test.dart
View File

@ -236,8 +236,7 @@ Future<void> _runIntegrationToolTests() async {
} }
Future<void> _runFlutterBuildApkHealthTests() async { Future<void> _runFlutterBuildApkHealthTests() async {
// Try "priming" the test environment by running historically problematic tests first. final List<String> allTests = Directory(path.join(_toolsPath, 'test', 'flutter_build_apk.shard'))
final List<String> toolIntegrationTests = Directory(path.join(_toolsPath, 'test', 'integration.shard'))
.listSync(recursive: true).whereType<File>() .listSync(recursive: true).whereType<File>()
.map<String>((FileSystemEntity entry) => path.relative(entry.path, from: _toolsPath)) .map<String>((FileSystemEntity entry) => path.relative(entry.path, from: _toolsPath))
.where((String testPath) => path.basename(testPath).endsWith('_test.dart')).toList(); .where((String testPath) => path.basename(testPath).endsWith('_test.dart')).toList();
@ -245,21 +244,7 @@ Future<void> _runFlutterBuildApkHealthTests() async {
await runDartTest( await runDartTest(
_toolsPath, _toolsPath,
forceSingleCore: true, forceSingleCore: true,
testPaths: selectIndexOfTotalSubshard<String>(toolIntegrationTests, subshardKey: '6_6'), testPaths: selectIndexOfTotalSubshard<String>(allTests),
collectMetrics: true,
runSkipped: true,
);
// Then run the health tests after.
final List<String> flutterBuildApkTests = Directory(path.join(_toolsPath, 'test', 'flutter_build_apk.shard'))
.listSync(recursive: true).whereType<File>()
.map<String>((FileSystemEntity entry) => path.relative(entry.path, from: _toolsPath))
.where((String testPath) => path.basename(testPath).endsWith('_test.dart')).toList();
await runDartTest(
_toolsPath,
forceSingleCore: true,
testPaths: selectIndexOfTotalSubshard<String>(flutterBuildApkTests),
collectMetrics: true, collectMetrics: true,
); );
} }

3
dev/bots/utils.dart
View File

@ -342,7 +342,6 @@ Future<void> runDartTest(String workingDirectory, {
bool ensurePrecompiledTool = true, bool ensurePrecompiledTool = true,
bool shuffleTests = true, bool shuffleTests = true,
bool collectMetrics = false, bool collectMetrics = false,
bool runSkipped = false,
}) async { }) async {
int? cpus; int? cpus;
final String? cpuVariable = Platform.environment['CPU']; // CPU is set in cirrus.yml final String? cpuVariable = Platform.environment['CPU']; // CPU is set in cirrus.yml
@ -380,8 +379,6 @@ Future<void> runDartTest(String workingDirectory, {
'--coverage=$coverage', '--coverage=$coverage',
if (perTestTimeout != null) if (perTestTimeout != null)
'--timeout=${perTestTimeout.inMilliseconds}ms', '--timeout=${perTestTimeout.inMilliseconds}ms',
if (runSkipped)
'--run-skipped',
if (testPaths != null) if (testPaths != null)
for (final String testPath in testPaths) for (final String testPath in testPaths)
testPath, testPath,