Index: tools/gardening/test/buildbot_data_test.dart |
diff --git a/tools/gardening/test/buildbot_data_test.dart b/tools/gardening/test/buildbot_data_test.dart |
index e02713502c950a80a9783d480c5105a8dbd353e8..7141683f508afa03d7f8e409f6829550953a52cd 100644 |
--- a/tools/gardening/test/buildbot_data_test.dart |
+++ b/tools/gardening/test/buildbot_data_test.dart |
@@ -6,9 +6,9 @@ |
import 'package:args/args.dart'; |
import 'package:expect/expect.dart'; |
+import 'package:gardening/src/bot.dart'; |
import 'package:gardening/src/buildbot_data.dart'; |
import 'package:gardening/src/buildbot_structures.dart'; |
-import 'package:gardening/src/client.dart'; |
import 'package:gardening/src/util.dart'; |
main(List<String> args) async { |
@@ -17,32 +17,34 @@ main(List<String> args) async { |
processArgResults(argResults); |
bool useLogdog = argResults['logdog']; |
- BuildbotClient client = |
- useLogdog ? new LogdogBuildbotClient() : new HttpBuildbotClient(); |
+ Bot bot = new Bot(logdog: useLogdog); |
List<String> failingUris = <String>[]; |
+ List<BuildUri> buildUris = <BuildUri>[]; |
for (BuildGroup buildGroup in buildGroups) { |
for (BuildSubgroup buildSubgroup in buildGroup.subgroups) { |
if (!useLogdog && !buildSubgroup.isActive) continue; |
- List<BuildUri> buildUris = |
- buildSubgroup.createUris(client.mostRecentBuildNumber); |
- for (BuildUri buildUri in buildUris) { |
- BuildResult result = await client.readResult(buildUri); |
- if (result == null) { |
- failingUris.add('$buildUri'); |
- } |
- } |
+ buildUris.addAll(buildSubgroup.createUris(bot.mostRecentBuildNumber)); |
+ } |
+ } |
+ List<BuildResult> buildResults = await bot.readResults(buildUris); |
+ for (int index = 0; index < buildResults.length; index++) { |
+ BuildUri buildUri = buildUris[index]; |
+ BuildResult result = buildResults[index]; |
+ if (result == null) { |
+ failingUris.add('$buildUri'); |
} |
} |
// TODO(johnniwinther): Find out why these steps cannot be read. |
Expect.setEquals([ |
- '/builders/pkg-mac10.11-release-be/builds/-2/' |
+ '/builders/pkg-mac10.11-release-be/builds/-1/' |
'steps/third_party/pkg_tested unit tests', |
- '/builders/pkg-linux-release-be/builds/-2/steps/' |
+ '/builders/pkg-linux-release-be/builds/-1/steps/' |
'third_party/pkg_tested unit tests', |
- '/builders/pkg-win7-release-be/builds/-2/steps/' |
+ '/builders/pkg-win7-release-be/builds/-1/steps/' |
'third_party/pkg_tested unit tests', |
- ], failingUris, "Unexpected failing buildbot uris: $failingUris"); |
+ ], failingUris, |
+ "Unexpected failing buildbot uris:\n ${failingUris.join('\n ')}"); |
- client.close(); |
+ bot.close(); |
} |