mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
[CP] Gold fix for stable branch (#139764)
Fixes https://github.com/flutter/flutter/issues/139673 Cherry picks https://github.com/flutter/flutter/pull/139706 to the stable branch to fix the tree.
This commit is contained in:
parent
b0366e0a3f
commit
54f1b881bd
@ -19,6 +19,7 @@ export 'package:flutter_goldens_client/skia_client.dart';
|
||||
// https://github.com/flutter/flutter/wiki/Writing-a-golden-file-test-for-package%3Aflutter
|
||||
|
||||
const String _kFlutterRootKey = 'FLUTTER_ROOT';
|
||||
final RegExp _kMainBranch = RegExp(r'master|main');
|
||||
|
||||
/// Main method that can be used in a `flutter_test_config.dart` file to set
|
||||
/// [goldenFileComparator] to an instance of [FlutterGoldenFileComparator] that
|
||||
@ -259,7 +260,9 @@ class FlutterPostSubmitFileComparator extends FlutterGoldenFileComparator {
|
||||
final bool luciPostSubmit = platform.environment.containsKey('SWARMING_TASK_ID')
|
||||
&& platform.environment.containsKey('GOLDCTL')
|
||||
// Luci tryjob environments contain this value to inform the [FlutterPreSubmitComparator].
|
||||
&& !platform.environment.containsKey('GOLD_TRYJOB');
|
||||
&& !platform.environment.containsKey('GOLD_TRYJOB')
|
||||
// Only run on main branch.
|
||||
&& _kMainBranch.hasMatch(platform.environment['GIT_BRANCH'] ?? '');
|
||||
|
||||
return luciPostSubmit;
|
||||
}
|
||||
@ -346,7 +349,9 @@ class FlutterPreSubmitFileComparator extends FlutterGoldenFileComparator {
|
||||
static bool isAvailableForEnvironment(Platform platform) {
|
||||
final bool luciPreSubmit = platform.environment.containsKey('SWARMING_TASK_ID')
|
||||
&& platform.environment.containsKey('GOLDCTL')
|
||||
&& platform.environment.containsKey('GOLD_TRYJOB');
|
||||
&& platform.environment.containsKey('GOLD_TRYJOB')
|
||||
// Only run on the main branch
|
||||
&& _kMainBranch.hasMatch(platform.environment['GIT_BRANCH'] ?? '');
|
||||
return luciPreSubmit;
|
||||
}
|
||||
}
|
||||
@ -413,9 +418,11 @@ class FlutterSkippingFileComparator extends FlutterGoldenFileComparator {
|
||||
/// If we are in a CI environment, LUCI or Cirrus, but are not using the other
|
||||
/// comparators, we skip.
|
||||
static bool isAvailableForEnvironment(Platform platform) {
|
||||
return platform.environment.containsKey('SWARMING_TASK_ID')
|
||||
return (platform.environment.containsKey('SWARMING_TASK_ID')
|
||||
// Some builds are still being run on Cirrus, we should skip these.
|
||||
|| platform.environment.containsKey('CIRRUS_CI');
|
||||
|| platform.environment.containsKey('CIRRUS_CI'))
|
||||
// If we are in CI, skip on branches that are not main.
|
||||
&& !_kMainBranch.hasMatch(platform.environment['GIT_BRANCH'] ?? '');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -716,6 +716,55 @@ void main() {
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : '12345678990',
|
||||
'GOLDCTL' : 'goldctl',
|
||||
'GIT_BRANCH' : 'master',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns false on release branches in postsubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GIT_BRANCH' : 'flutter-3.16-candidate.0',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true on master branch in postsubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GIT_BRANCH' : 'master',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true on main branch in postsubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GIT_BRANCH' : 'main',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
@ -828,6 +877,57 @@ void main() {
|
||||
});
|
||||
|
||||
group('correctly determines testing environment', () {
|
||||
test('returns false on release branches in presubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GOLD_TRYJOB' : 'true',
|
||||
'GIT_BRANCH' : 'flutter-3.16-candidate.0',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterPreSubmitFileComparator.isAvailableForEnvironment(platform),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true on master branch in presubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GOLD_TRYJOB' : 'true',
|
||||
'GIT_BRANCH' : 'master',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterPreSubmitFileComparator.isAvailableForEnvironment(platform),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true on main branch in presubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GOLD_TRYJOB' : 'true',
|
||||
'GIT_BRANCH' : 'main',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterPreSubmitFileComparator.isAvailableForEnvironment(platform),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true for Luci', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
@ -835,6 +935,7 @@ void main() {
|
||||
'SWARMING_TASK_ID' : '12345678990',
|
||||
'GOLDCTL' : 'goldctl',
|
||||
'GOLD_TRYJOB' : 'git/ref/12345/head',
|
||||
'GIT_BRANCH' : 'master',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
@ -908,6 +1009,39 @@ void main() {
|
||||
|
||||
group('Skipping', () {
|
||||
group('correctly determines testing environment', () {
|
||||
test('returns true on release branches in presubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GOLD_TRYJOB' : 'true',
|
||||
'GIT_BRANCH' : 'flutter-3.16-candidate.0',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterSkippingFileComparator.isAvailableForEnvironment(platform),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true on release branches in postsubmit', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
'SWARMING_TASK_ID' : 'sweet task ID',
|
||||
'GOLDCTL' : 'some/path',
|
||||
'GIT_BRANCH' : 'flutter-3.16-candidate.0',
|
||||
},
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterSkippingFileComparator.isAvailableForEnvironment(platform),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('returns true on Cirrus builds', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
@ -936,7 +1070,7 @@ void main() {
|
||||
);
|
||||
});
|
||||
|
||||
test('returns false - no CI', () {
|
||||
test('returns false - not in CI', () {
|
||||
platform = FakePlatform(
|
||||
environment: <String, String>{
|
||||
'FLUTTER_ROOT': _kFlutterRoot,
|
||||
@ -944,8 +1078,7 @@ void main() {
|
||||
operatingSystem: 'macos',
|
||||
);
|
||||
expect(
|
||||
FlutterSkippingFileComparator.isAvailableForEnvironment(
|
||||
platform),
|
||||
FlutterSkippingFileComparator.isAvailableForEnvironment(platform),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user