Revert "Log all output of ios-deploy" (#127405)

Reverts #127222
flutter · May 23, 2023 · d452ce9 · d452ce9
1 parent 20ccf09
commit d452ce9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 27 deletions.
diff --git a/packages/flutter_tools/lib/src/ios/ios_deploy.dart b/packages/flutter_tools/lib/src/ios/ios_deploy.dart
@@ -348,12 +348,6 @@ class IOSDeployDebugger {
           .transform<String>(utf8.decoder)
           .transform<String>(const LineSplitter())
           .listen((String line) {
-
-        // TODO(vashworth): Revert after https://github.com/flutter/flutter/issues/121231 is resolved.
-        if (line.isNotEmpty) {
-          _logger.printTrace(line);
-        }
-
         _monitorIOSDeployFailure(line, _logger);
 
         // (lldb)    platform select remote-'ios' --sysroot
@@ -371,6 +365,7 @@ class IOSDeployDebugger {
           }
           final String prompt = line.substring(0, promptEndIndex);
           lldbRun = RegExp(RegExp.escape(prompt) + r'\s*run');
+          _logger.printTrace(line);
           return;
         }
 
@@ -389,6 +384,7 @@ class IOSDeployDebugger {
         // success
         // 2020-09-15 13:42:25.185474-0700 Runner[477:181141] flutter: The Dart VM service is listening on http://127.0.0.1:57782/
         if (lldbRun.hasMatch(line)) {
+          _logger.printTrace(line);
           _debuggerState = _IOSDeployDebuggerState.launching;
           // TODO(vashworth): Remove all debugger state comments when https://github.com/flutter/flutter/issues/126412 is resolved.
           _logger.printTrace('Debugger state set to launching.');
@@ -397,6 +393,7 @@ class IOSDeployDebugger {
         // Next line after "run" must be "success", or the attach failed.
         // Example: "error: process launch failed"
         if (_debuggerState == _IOSDeployDebuggerState.launching) {
+          _logger.printTrace(line);
           final bool attachSuccess = line == 'success';
           _debuggerState = attachSuccess ? _IOSDeployDebuggerState.attached : _IOSDeployDebuggerState.detached;
           _logger.printTrace('Debugger state set to ${attachSuccess ? 'attached' : 'detached'}.');
@@ -411,6 +408,7 @@ class IOSDeployDebugger {
         // process signal SIGSTOP
         if (line.contains(_signalStop)) {
           // The app is about to be stopped. Only show in verbose mode.
+          _logger.printTrace(line);
           return;
         }
 
@@ -423,6 +421,7 @@ class IOSDeployDebugger {
 
         if (line == _backTraceAll) {
           // The app is stopped and the backtrace for all threads will be printed.
+          _logger.printTrace(line);
           // Even though we're not "detached", just stopped, mark as detached so the backtrace
           // is only show in verbose.
           _debuggerState = _IOSDeployDebuggerState.detached;
@@ -439,6 +438,7 @@ class IOSDeployDebugger {
 
         if (line.contains('PROCESS_STOPPED') || _lldbProcessStopped.hasMatch(line)) {
           // The app has been stopped. Dump the backtrace, and detach.
+          _logger.printTrace(line);
           _iosDeployProcess?.stdin.writeln(_backTraceAll);
           if (_processResumeCompleter == null) {
             detach();
@@ -449,24 +449,28 @@ class IOSDeployDebugger {
         if (line.contains('PROCESS_EXITED') || _lldbProcessExit.hasMatch(line)) {
           // The app exited or crashed, so exit. Continue passing debugging
           // messages to the log reader until it exits to capture crash dumps.
+          _logger.printTrace(line);
           exit();
           return;
         }
         if (_lldbProcessDetached.hasMatch(line)) {
           // The debugger has detached from the app, and there will be no more debugging messages.
           // Kill the ios-deploy process.
+          _logger.printTrace(line);
           exit();
           return;
         }
 
         if (_lldbProcessResuming.hasMatch(line)) {
+          _logger.printTrace(line);
           // we marked this detached when we received [_backTraceAll]
           _debuggerState = _IOSDeployDebuggerState.attached;
           _logger.printTrace('Debugger state set to attached.');
           return;
         }
 
         if (_debuggerState != _IOSDeployDebuggerState.attached) {
+          _logger.printTrace(line);
           return;
         }
         if (lastLineFromDebugger != null && lastLineFromDebugger!.isNotEmpty && line.isEmpty) {
@@ -484,7 +488,7 @@ class IOSDeployDebugger {
           .transform<String>(const LineSplitter())
           .listen((String line) {
         _monitorIOSDeployFailure(line, _logger);
-        _logger.printTrace('error: $line');
+        _logger.printTrace(line);
       });
       unawaited(_iosDeployProcess!.exitCode.then((int status) async {
         _logger.printTrace('ios-deploy exited with code $exitCode');

diff --git a/packages/flutter_tools/test/general.shard/ios/ios_deploy_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_deploy_test.dart
@@ -94,26 +94,6 @@ void main () {
         logger = BufferLogger.test();
       });
 
-      testWithoutContext('print all lines', () async {
-        final StreamController<List<int>> stdin = StreamController<List<int>>();
-        final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
-          FakeCommand(
-            command: const <String>['ios-deploy'],
-            stdout: "(mylldb)    platform select remote-'ios' --sysroot\r\n(mylldb)     run\r\nsuccess\r\nrandom string\r\n",
-            stdin: IOSink(stdin.sink),
-          ),
-        ]);
-        final IOSDeployDebugger iosDeployDebugger = IOSDeployDebugger.test(
-          processManager: processManager,
-          logger: logger,
-        );
-        expect(await iosDeployDebugger.launchAndAttach(), isTrue);
-        expect(logger.traceText, contains("(mylldb)    platform select remote-'ios' --sysroot"));
-        expect(logger.traceText, contains('(mylldb)     run'));
-        expect(logger.traceText, contains('success'));
-        expect(logger.traceText, contains('random string'));
-      });
-
       testWithoutContext('custom lldb prompt', () async {
         final StreamController<List<int>> stdin = StreamController<List<int>>();
         final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[