De-flake the analysis server integration tests.

devoncarew · commit-bot@chromium.org · commit 5a259ac3d0fa · 2018-08-03T05:50:07.000Z
Change-Id: I548720c3a26fdd0f67f29755614552106be4f3e1 Reviewed-on: https://dart-review.googlesource.com/68320 Commit-Queue: Devon Carew <devoncarew@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/test/integration/support/integration_tests.dart
@@ -598,14 +598,24 @@ class Server {
    */
   void listenToOutput(NotificationProcessor notificationProcessor) {
     _process.stdout
-        .transform((new Utf8Codec()).decoder)
+        .transform(utf8.decoder)
         .transform(new LineSplitter())
         .listen((String line) {
       lastCommunicationTime = currentElapseTime;
       String trimmedLine = line.trim();
-      if (trimmedLine.startsWith('Observatory listening on ')) {
+
+      // Guard against lines like:
+      //   {"event":"server.connected","params":{...}}Observatory listening on ...
+      final String observatoryMessage = 'Observatory listening on ';
+      if (trimmedLine.contains(observatoryMessage)) {
+        trimmedLine = trimmedLine
+            .substring(0, trimmedLine.indexOf(observatoryMessage))
+            .trim();
+      }
+      if (trimmedLine.isEmpty) {
         return;
       }
+
       _recordStdio('<== $trimmedLine');
       var message;
       try {
