Remove unused call to discoverPackagesInRepository from test scripts.

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 709 matching lines @@
   bool isTestFile(String filename) {
     // Use the specified predicate, if provided.
     if (isTestFilePredicate != null) return isTestFilePredicate(filename);
     return filename.endsWith("Test.dart");
   }
 
   bool isHtmlTestFile(String filename) => filename.endsWith('_htmltest.html');
 
   List<String> additionalOptions(Path filePath) => [];
 
-  Map<String, String> localPackageDirectories;
+  forEachTest(Function onTest, Map testCache, [VoidFunction onDone]) async {
+    await updateDartium();
+    doTest = onTest;
+    testExpectations = await readExpectations();
 
-  void forEachTest(Function onTest, Map testCache, [VoidFunction onDone]) {
-    discoverPackagesInRepository().then((Map packageDirectories) {

[kustermann, 2017/04/04 15:04:43]

Can't you get rid of the discoverPackagesInRepository() as well?

[Bill Hesse, 2017/04/04 15:22:28]

There is another use of it, in the PkgBuildTestSuite class.  I have an issue
filed to remove that class and the functions it uses, putting them in a
completely separate standalone test script.  This CL is work to enable that.

-      localPackageDirectories = packageDirectories;
-      return updateDartium();
-    }).then((_) {
-      doTest = onTest;
-
-      return readExpectations();
-    }).then((expectations) {
-      testExpectations = expectations;
-
-      // Checked if we have already found and generated the tests for
-      // this suite.
-      if (!testCache.containsKey(suiteName)) {
-        cachedTests = testCache[suiteName] = [];
-        return enqueueTests();
-      } else {
-        // We rely on enqueueing completing asynchronously.

[Bill Hesse, 2017/04/04 14:58:49]

 An await function always returns asynchronously, waiting on the event loop at
least once, so this is no longer needed.

[kustermann, 2017/04/04 15:04:11]

Acknowledged.

-        return asynchronously(() {
-          for (var info in testCache[suiteName]) {
-            enqueueTestCaseFromTestInformation(info);
-          }
-        });
+    // Check if we have already found and generated the tests for this suite.
+    if (!testCache.containsKey(suiteName)) {
+      cachedTests = testCache[suiteName] = [];
+      await enqueueTests();
+    } else {
+      for (var info in testCache[suiteName]) {
+        enqueueTestCaseFromTestInformation(info);
       }
-    }).then((_) {
-      testExpectations = null;
-      cachedTests = null;
-      doTest = null;
-      if (onDone != null) onDone();
-    });
+    }
+    testExpectations = null;
+    cachedTests = null;
+    doTest = null;
+    if (onDone != null) onDone();
   }
 
   /**
    * If Content shell/Dartium is required, and not yet updated, waits for
    * the update then completes. Otherwise completes immediately.
    */
   Future updateDartium() {
     var completer = new Completer();
     var updater = runtimeUpdater(configuration);
     if (updater == null || updater.updated) {
@@ skipping 1649 matching lines @@
       }
       if (path.length > WINDOWS_SHORTEN_PATH_LIMIT) {
         ++shortNameCounter;
         var pathEnd = path.substring(path.length - WINDOWS_PATH_END_LENGTH);
         path = "short${shortNameCounter}_$pathEnd";
       }
     }
     return path;
   }
 }