languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 21:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[infra] Fix approve_results race condition checking failing on new builders.

Browse source 
It would accidentally compare a null old approval map with the new approvals
instead of using an empty map for the old approvals.

While here, remove debug code that shouldn't have been committed.

Change-Id: I071bc6fc830bbb0b0cec310a189c0ef0a46f2bb8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98000
Reviewed-by: Alexander Thomas <athom@google.com>
This commit is contained in:
Jonas Termansen 2019-03-27 09:56:22 +00:00
parent 440d287fa8
commit bd99509601
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/approve_results.dart
View file

@ -808,16 +808,6 @@ ${parser.usage}""");
}
}
// Reconstruct the old approvals so we can double check there was no race
// condition when uploading.
final oldApprovalsForBuilders = <String, Map<String, Map<String, dynamic>>>{};
for (final test in tests) {
if (test.approvedResultData == null) continue;
final newApprovals = oldApprovalsForBuilders.putIfAbsent(
test.bot, () => new SplayTreeMap<String, Map<String, dynamic>>());
newApprovals[test.key] = test.approvedResultData;
}
// Build the new approval data with the changes in test results applied.
final newApprovalsForBuilders = <String, Map<String, Map<String, dynamic>>>{};
@ -926,14 +916,18 @@ ${parser.usage}""");
}
}
// Reconstruct the old approvals so we can double check there was no race
// condition when uploading.
final oldApprovalsForBuilders = <String, Map<String, Map<String, dynamic>>>{};
for (final test in tests) {
if (test.approvedResultData == null) continue;
final oldApprovals = oldApprovalsForBuilders.putIfAbsent(
test.bot, () => new SplayTreeMap<String, Map<String, dynamic>>());
oldApprovals[test.key] = test.approvedResultData;
}
for (final builder in newApprovalsForBuilders.keys) {
final newApprovals = newApprovalsForBuilders[builder];
for (final key in newApprovals.keys) {
final approvalData = newApprovals[key];
if (!approvalData.containsKey("preapprovals")) {
throw new Exception(approvalData.toString());
}
}
oldApprovalsForBuilders.putIfAbsent(
builder, () => <String, Map<String, dynamic>>{});
}
// Update approved_results.json for each builder with unapproved changes.