[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[tool] when writing to openssl as a part of macOS/iOS code-signing, flush the stdin stream before closing it #150120

Merged
merged 13 commits into from
Jun 28, 2024
Merged

[tool] when writing to openssl as a part of macOS/iOS code-signing, flush the stdin stream before closing it #150120

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
338c6b8
instead of crashing, exit to tool if we are unable to write to openssl
andrewkolos Jun 12, 2024
848bbc5
have writeToStdinGuarded share implementation with writelnToStdinGuarded
andrewkolos Jun 21, 2024
69452eb
attempt 2
andrewkolos Jun 21, 2024
f728c15
nits
andrewkolos Jun 24, 2024
98140e3
upgrade doc to mention that we call flush on the sink
andrewkolos Jun 24, 2024
515a5c9
nits
andrewkolos Jun 25, 2024
386cf4a
handle any error from flush
andrewkolos Jun 28, 2024
104f584
patch the new test
andrewkolos Jun 28, 2024
75edc90
satisfy lint
andrewkolos Jun 28, 2024
3a03674
patch new test again
andrewkolos Jun 28, 2024
2e11cd0
fix comment that already went stale before the PR even merged
andrewkolos Jun 28, 2024
6d10601
self-nit
andrewkolos Jun 28, 2024
f01f1c1
simplify new test of writeToStdinGuarded
andrewkolos Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
simplify new test of writeToStdinGuarded
  • Loading branch information
@andrewkolos
andrewkolos committed Jun 28, 2024
commit f01f1c17f1b0c6dcce6ac037a105c6219bae7bf6
48 changes: 13 additions & 35 deletions packages/flutter_tools/test/general.shard/base/process_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,45 +450,23 @@ void main() {
group('writeToStdinGuarded', () {
testWithoutContext('handles any error thrown by stdin.flush', () async {
final _ThrowsOnFlushIOSink stdin = _ThrowsOnFlushIOSink();
final Completer<bool> fooCommandCompleter = Completer<bool>();
final Future<bool> >

void fooOnRun(List<String> command) {
ProcessUtils.writeToStdinGuarded(
stdin: stdin,
content: 'message to stdin',
onError: (Object error, StackTrace stackTrace) {
fooCommandCompleter.complete(true);
},
).then((_) {
if (!fooCommandCompleter.isCompleted) {
fooCommandCompleter.complete(false);
}
}).onError((Exception error, StackTrace stackTrace) {
// onError should have handled any error, so either the onError callback
// or the .then callback threw. Fail the test.
throw error;
});
}

final FakeProcessManager processManager = FakeProcessManager.list(
<FakeCommand>[
FakeCommand(
command: const <String>['foo'],
stdin: stdin,
onRun: fooOnRun,
completer: fooCommandCompleter,
),
],
Object? errorPassedToCallback;

await ProcessUtils.writeToStdinGuarded(
stdin: stdin,
content: 'message to stdin',
onError: (Object error, StackTrace stackTrace) {
errorPassedToCallback = error;
},
);

await processManager.run(<String>['foo']);

expect(
await onErrorCalled,
isTrue,
reason: 'onError argument to writeToStdinGuarded should have been called',
errorPassedToCallback,
isNotNull,
reason: 'onError callback should have been invoked.',
);

expect(errorPassedToCallback, const TypeMatcher<SocketException>());
});
});
}
Expand Down