From 34d2ccff68d6e50bd142cda6844313e14f495fdc Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Mon, 7 Feb 2022 13:55:22 -0800 Subject: [PATCH] Change support for VM service message from "Dart VM Service listening" to "The Dart VM Service is listening" (flutter/engine#31310) See https://github.com/dart-lang/sdk/issues/46756 --- engine/src/flutter/shell/testing/observatory/launcher.dart | 2 +- engine/src/flutter/testing/android_systrace_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/shell/testing/observatory/launcher.dart b/engine/src/flutter/shell/testing/observatory/launcher.dart index e724c0a626a..c3434c729fa 100644 --- a/engine/src/flutter/shell/testing/observatory/launcher.dart +++ b/engine/src/flutter/shell/testing/observatory/launcher.dart @@ -35,7 +35,7 @@ class ShellProcess { Uri? _extractVMServiceUri(String str) { final listeningMessageRegExp = RegExp( - r'(?:Observatory|Dart VM Service) listening on ((http|//)[a-zA-Z0-9:/=_\-\.\[\]]+)', + r'(?:Observatory|The Dart VM Service is) listening on ((http|//)[a-zA-Z0-9:/=_\-\.\[\]]+)', ); final match = listeningMessageRegExp.firstMatch(str); if (match != null) { diff --git a/engine/src/flutter/testing/android_systrace_test.py b/engine/src/flutter/testing/android_systrace_test.py index cb730b11d06..0d4606f8853 100755 --- a/engine/src/flutter/testing/android_systrace_test.py +++ b/engine/src/flutter/testing/android_systrace_test.py @@ -61,7 +61,7 @@ def LaunchPackage(package_name, activity_name, adb_path='adb'): '%s/%s' % (package_name, activity_name)], stderr=subprocess.STDOUT) for line in logcat.stdout: print('>>>>>>>> ' + line.strip()) - if ('Observatory listening' in line) or ('Dart VM Service listening' in line): + if ('Observatory listening' in line) or ('Dart VM Service is listening' in line): logcat.kill() break