Skip to content

Commit 5a259ac

Browse files
devoncarewcommit-bot@chromium.org
authored andcommitted
De-flake the analysis server integration tests.
Change-Id: I548720c3a26fdd0f67f29755614552106be4f3e1 Reviewed-on: https://dart-review.googlesource.com/68320 Commit-Queue: Devon Carew <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]>
1 parent 380696f commit 5a259ac

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

pkg/analysis_server/test/integration/support/integration_tests.dart

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,14 +598,24 @@ class Server {
598598
*/
599599
void listenToOutput(NotificationProcessor notificationProcessor) {
600600
_process.stdout
601-
.transform((new Utf8Codec()).decoder)
601+
.transform(utf8.decoder)
602602
.transform(new LineSplitter())
603603
.listen((String line) {
604604
lastCommunicationTime = currentElapseTime;
605605
String trimmedLine = line.trim();
606-
if (trimmedLine.startsWith('Observatory listening on ')) {
606+
607+
// Guard against lines like:
608+
// {"event":"server.connected","params":{...}}Observatory listening on ...
609+
final String observatoryMessage = 'Observatory listening on ';
610+
if (trimmedLine.contains(observatoryMessage)) {
611+
trimmedLine = trimmedLine
612+
.substring(0, trimmedLine.indexOf(observatoryMessage))
613+
.trim();
614+
}
615+
if (trimmedLine.isEmpty) {
607616
return;
608617
}
618+
609619
_recordStdio('<== $trimmedLine');
610620
var message;
611621
try {

0 commit comments

Comments
 (0)