Skip to content

fix(daemon): construct test output channels via output_channel() - #1832

Closed
Greg Lamberson (glamberson) wants to merge 1 commit into
Devolutions:masterfrom
lamco-admin:fix/daemon-test-output-channel-construction
Closed

fix(daemon): construct test output channels via output_channel()#1832
Greg Lamberson (glamberson) wants to merge 1 commit into
Devolutions:masterfrom
lamco-admin:fix/daemon-test-output-channel-construction

Conversation

@glamberson

Copy link
Copy Markdown
Contributor

cargo check -p ironrdp-daemon --tests currently fails on bare master with two
E0308 errors at daemon.rs:2239 and :2276: expected OutputEventReceiver, found tokio::sync::mpsc::Receiver<_>.

connection_failure_status_preserves_gateway_error_sources and
terminated_error_status_preserves_session_error_sources (added by #1822,
merged after #1815 changed consume_output's parameter type) construct
output_rx via the pre-#1815 mpsc::channel(1) pattern. Every other call site
in this file, five of them, already uses #1815's output_channel(1)
constructor; these two were missed. Swaps both to match.

No behavior change: output_channel(1) still yields an
(OutputEventSender, OutputEventReceiver) pair consumed identically by both
tests, both of which construct a MustDeliver-classified event
(ConnectionFailure, Terminated), unaffected by the drop-policy routing
#1815 introduced.

@glamberson

Copy link
Copy Markdown
Contributor Author

Superseded by #1827, which includes this exact fix (same two-line change, mpsc::channel(1) to output_channel(1) at both call sites) as part of its larger scope. Closing in favor of that one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

1 participant