Unverified Commit 749589d8 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] Remove context usage from status and clean up test cases (#48446)

parent 5f4e4a3f
...@@ -974,7 +974,11 @@ class NotifyingLogger extends Logger { ...@@ -974,7 +974,11 @@ class NotifyingLogger extends Logger {
}) { }) {
assert(timeout != null); assert(timeout != null);
printStatus(message); printStatus(message);
return SilentStatus(timeout: timeout, timeoutConfiguration: timeoutConfiguration); return SilentStatus(
timeout: timeout,
timeoutConfiguration: timeoutConfiguration,
stopwatch: Stopwatch(),
);
} }
void dispose() { void dispose() {
...@@ -1181,7 +1185,7 @@ class _AppRunLogger extends Logger { ...@@ -1181,7 +1185,7 @@ class _AppRunLogger extends Logger {
'progressId': progressId, 'progressId': progressId,
'finished': true, 'finished': true,
}); });
})..start(); }, stopwatch: Stopwatch())..start();
return _status; return _status;
} }
......
...@@ -108,12 +108,14 @@ Future<T> runInContext<T>( ...@@ -108,12 +108,14 @@ Future<T> runInContext<T>(
stdio: globals.stdio, stdio: globals.stdio,
outputPreferences: outputPreferences, outputPreferences: outputPreferences,
timeoutConfiguration: timeoutConfiguration, timeoutConfiguration: timeoutConfiguration,
platform: globals.platform,
) )
: StdoutLogger( : StdoutLogger(
terminal: globals.terminal, terminal: globals.terminal,
stdio: globals.stdio, stdio: globals.stdio,
outputPreferences: outputPreferences, outputPreferences: outputPreferences,
timeoutConfiguration: timeoutConfiguration, timeoutConfiguration: timeoutConfiguration,
platform: globals.platform,
), ),
MacOSWorkflow: () => const MacOSWorkflow(), MacOSWorkflow: () => const MacOSWorkflow(),
MDnsObservatoryDiscovery: () => MDnsObservatoryDiscovery(), MDnsObservatoryDiscovery: () => MDnsObservatoryDiscovery(),
......
...@@ -259,6 +259,9 @@ class Doctor { ...@@ -259,6 +259,9 @@ class Doctor {
timeout: timeoutConfiguration.fastOperation, timeout: timeoutConfiguration.fastOperation,
slowWarningCallback: () => validator.slowWarning, slowWarningCallback: () => validator.slowWarning,
timeoutConfiguration: timeoutConfiguration, timeoutConfiguration: timeoutConfiguration,
stopwatch: Stopwatch(),
supportsColor: globals.terminal.supportsColor,
platform: globals.platform,
); );
ValidationResult result; ValidationResult result;
try { try {
......
...@@ -285,6 +285,9 @@ class XcodeProjectInterpreter { ...@@ -285,6 +285,9 @@ class XcodeProjectInterpreter {
final Status status = Status.withSpinner( final Status status = Status.withSpinner(
timeout: timeoutConfiguration.fastOperation, timeout: timeoutConfiguration.fastOperation,
timeoutConfiguration: timeoutConfiguration, timeoutConfiguration: timeoutConfiguration,
platform: globals.platform,
stopwatch: Stopwatch(),
supportsColor: globals.terminal.supportsColor,
); );
final List<String> showBuildSettingsCommand = <String>[ final List<String> showBuildSettingsCommand = <String>[
_executable, _executable,
......
...@@ -239,7 +239,7 @@ class FlutterCommandRunner extends CommandRunner<void> { ...@@ -239,7 +239,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
// Check for verbose. // Check for verbose.
if (topLevelResults['verbose'] as bool) { if (topLevelResults['verbose'] as bool) {
// Override the logger. // Override the logger.
contextOverrides[Logger] = VerboseLogger(globals.logger, stopwatch: Stopwatch()); contextOverrides[Logger] = VerboseLogger(globals.logger);
} }
// Don't set wrapColumns unless the user said to: if it's set, then all // Don't set wrapColumns unless the user said to: if it's set, then all
......
...@@ -704,7 +704,11 @@ class StreamLogger extends Logger { ...@@ -704,7 +704,11 @@ class StreamLogger extends Logger {
int progressIndicatorPadding = kDefaultStatusPadding, int progressIndicatorPadding = kDefaultStatusPadding,
}) { }) {
_log('[progress] $message'); _log('[progress] $message');
return SilentStatus(timeout: timeout, timeoutConfiguration: timeoutConfiguration)..start(); return SilentStatus(
timeout: timeout,
timeoutConfiguration: timeoutConfiguration,
stopwatch: Stopwatch(),
)..start();
} }
bool _interrupt = false; bool _interrupt = false;
......
...@@ -196,6 +196,7 @@ void main() { ...@@ -196,6 +196,7 @@ void main() {
stdio: mockStdio, stdio: mockStdio,
terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()), terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()),
timeoutConfiguration: const TimeoutConfiguration(), timeoutConfiguration: const TimeoutConfiguration(),
platform: FakePlatform(),
), ),
WebSocketConnector: () => (String url, {CompressionOptions compression}) async => throw const SocketException('test'), WebSocketConnector: () => (String url, {CompressionOptions compression}) async => throw const SocketException('test'),
}); });
...@@ -275,6 +276,7 @@ void main() { ...@@ -275,6 +276,7 @@ void main() {
terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()), terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()),
stdio: mockStdio, stdio: mockStdio,
timeoutConfiguration: const TimeoutConfiguration(), timeoutConfiguration: const TimeoutConfiguration(),
platform: FakePlatform(),
), ),
}); });
...@@ -292,6 +294,7 @@ void main() { ...@@ -292,6 +294,7 @@ void main() {
terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()), terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()),
stdio: mockStdio, stdio: mockStdio,
timeoutConfiguration: const TimeoutConfiguration(), timeoutConfiguration: const TimeoutConfiguration(),
platform: FakePlatform(),
), ),
}); });
...@@ -310,6 +313,7 @@ void main() { ...@@ -310,6 +313,7 @@ void main() {
terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()), terminal: AnsiTerminal(stdio: mockStdio, platform: const LocalPlatform()),
stdio: mockStdio, stdio: mockStdio,
timeoutConfiguration: const TimeoutConfiguration(), timeoutConfiguration: const TimeoutConfiguration(),
platform: FakePlatform(),
), ),
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment