Fix more flakiness in pkg tests.

pkg/analysis_server/test/analysis_server_test.dart

 // Copyright (c) 2014, 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.
 
 library test.analysis_server;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
@@ skipping 52 matching lines @@
 ''');
     Source fooSource = foo.createSource();
     File bar = resourceProvider.newFile(
         '/bar/bar.dart',
         '''
 library bar;
 import "../foo/foo.dart";
 ''');
     Source barSource = bar.createSource();
     server.setAnalysisRoots('0', ['/foo', '/bar'], [], {});
-    return pumpEventQueue(40).then((_) {
+    return server.onAnalysisComplete.then((_) {
       expect(server.statusAnalyzing, isFalse);
       // Make sure getAnalysisContext returns the proper context for each.
       AnalysisContext fooContext =
           server.getAnalysisContextForSource(fooSource);
       expect(fooContext, isNotNull);
       AnalysisContext barContext =
           server.getAnalysisContextForSource(barSource);
       expect(barContext, isNotNull);
       expect(fooContext, isNot(same(barContext)));
       expect(fooContext.getKindOf(fooSource), SourceKind.LIBRARY);
@@ skipping 19 matching lines @@
     File foo = resourceProvider.newFile('/foo/foo.dart', 'library lib;');
     Source fooSource = foo.createSource();
     File bar = resourceProvider.newFile('/bar/bar.dart', 'library lib;');
     Source barSource = bar.createSource();
     server.setAnalysisRoots('0', ['/foo', '/bar'], [], {});
     AnalysisContext fooContext = server.getAnalysisContextForSource(fooSource);
     expect(fooContext, isNotNull);
     AnalysisContext barContext = server.getAnalysisContextForSource(barSource);
     expect(barContext, isNotNull);
     expect(fooContext, isNot(same(barContext)));
-    return pumpEventQueue(40).then((_) {
+    return server.onAnalysisComplete.then((_) {
       expect(server.statusAnalyzing, isFalse);
       // Make sure getAnalysisContext returned the proper context for each.
       expect(fooContext.getKindOf(fooSource), SourceKind.LIBRARY);
       expect(fooContext.getKindOf(barSource), SourceKind.UNKNOWN);
       expect(barContext.getKindOf(fooSource), SourceKind.UNKNOWN);
       expect(barContext.getKindOf(barSource), SourceKind.LIBRARY);
     });
   }
 
   void processRequiredPlugins() {
@@ skipping 105 matching lines @@
     server.serverServices = [ServerService.STATUS].toSet();
     // Analyze project foo containing foo.dart and project bar containing
     // bar.dart.
     resourceProvider.newFolder('/foo');
     resourceProvider.newFolder('/bar');
     File foo = resourceProvider.newFile('/foo/foo.dart', 'library lib;');
     Source fooSource = foo.createSource();
     File bar = resourceProvider.newFile('/bar/bar.dart', 'library lib;');
     Source barSource = bar.createSource();
     server.setAnalysisRoots('0', ['/foo', '/bar'], [], {});
-    return pumpEventQueue(500).then((_) {
+    return server.onAnalysisComplete.then((_) {
       expect(server.statusAnalyzing, isFalse);
       // Make sure getAnalysisContext returns the proper context for each.
       AnalysisContext fooContext =
           server.getAnalysisContextForSource(fooSource);
       expect(fooContext, isNotNull);
       AnalysisContext barContext =
           server.getAnalysisContextForSource(barSource);
       expect(barContext, isNotNull);
       expect(fooContext, isNot(same(barContext)));
       expect(fooContext.getKindOf(fooSource), SourceKind.LIBRARY);
@@ skipping 343 matching lines @@
   _MockServerOperation(this.context);
 
   @override
   ServerOperationPriority get priority => ServerOperationPriority.ANALYSIS;
 
   @override
   void perform(AnalysisServer server) {
     isComplete = true;
   }
 }