Wait for Analysis Server errors only while waiting for a response.

Change-Id: Ifd07293322b69cc9bab98e3698d63249b62abdb0
Reviewed-on: https://dart-review.googlesource.com/69242
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/test/analysis/get_errors_test.dart

@@ -162,20 +162,6 @@ class GetErrorsTest_UseCFE extends GetErrorsTest {
   @override
   test_fileDoesNotExist() => super.test_fileDoesNotExist();
 
-  @failingTest
-  @override
-  test_hasErrors() {
-    fail('Flaky');
-//    return super.test_hasErrors();
-  }
-
-  @failingTest
-  @override
-  test_noErrors() {
-    fail('Flaky');
-//    return super.test_noErrors();
-  }
-
   @override
   test_removeContextAfterRequest() => super.test_removeContextAfterRequest();
 }

pkg/analysis_server/test/edit/refactoring_test.dart

@@ -604,11 +604,6 @@ main() {
 class ExtractLocalVariableTest_UseCFE extends ExtractLocalVariableTest {
   @override
   bool get useCFE => true;
-
-  @failingTest
-  @override
-  test_resetOnAnalysisSetChanged_overlay() =>
-      super.test_resetOnAnalysisSetChanged_overlay();
 }
 
 @reflectiveTest

pkg/analysis_server/test/edit/sort_members_test.dart

@@ -260,9 +260,4 @@ class C {}
 class SortMembersTest_UseCFE extends SortMembersTest {
   @override
   bool get useCFE => true;
-
-  @failingTest
-  @override
-  test_OK_directives_withAnnotation() =>
-      super.test_OK_directives_withAnnotation();
 }

pkg/analysis_server/test/mocks.dart

@@ -57,7 +57,10 @@ class MockServerChannel implements ServerCommunicationChannel {
   List<Notification> notificationsReceived = [];
   bool _closed = false;
 
+  String name;
+
   MockServerChannel();
+
   @override
   void close() {
     _closed = true;
@@ -83,6 +86,8 @@ class MockServerChannel implements ServerCommunicationChannel {
     }
     notificationsReceived.add(notification);
     if (errorCompleter != null && notification.event == 'server.error') {
+      print(
+          '[server.error] test: $name message: ${notification.params['message']}');
       errorCompleter.completeError(
           new ServerError(notification.params['message']),
           new StackTrace.fromString(notification.params['stackTrace']));
@@ -141,8 +146,12 @@ class MockServerChannel implements ServerCommunicationChannel {
     Future<Response> response =
         responseController.stream.firstWhere((response) => response.id == id);
     if (throwOnError) {
-      errorCompleter ??= new Completer<Response>();
-      return Future.any([response, errorCompleter.future]);
+      errorCompleter = new Completer<Response>();
+      try {
+        return Future.any([response, errorCompleter.future]);
+      } finally {
+        errorCompleter = null;
+      }
     }
     return response;
   }

pkg/analysis_server/test/search/type_hierarchy_test.dart

@@ -1087,7 +1087,8 @@ class GetTypeHierarchyTest_UseCFE extends GetTypeHierarchyTest {
   @failingTest
   @override
   test_class_extendsTypeB() {
-    return callFailingTest(super.test_class_extendsTypeB);
+    fail('Timeout');
+//    return callFailingTest(super.test_class_extendsTypeB);
   }
 
   @failingTest