-
Notifications
You must be signed in to change notification settings - Fork 887
fix: use terminal emulator that keeps state in ReconnectingPTY tests #9765
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.
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Spike Curtis <spike@coder.com>
Signed-off-by: Spike Curtis <spike@coder.com>
Signed-off-by: Spike Curtis <spike@coder.com>
Signed-off-by: Spike Curtis <spike@coder.com>
spikecurtis
commented
Sep 19, 2023
require.ErrorIs(t, testutil.ReadUntil(ctx, t, netConn3, nil), io.EOF) | ||
tr4 := testutil.NewTerminalReader(t, netConn4) | ||
require.NoError(t, tr4.ReadUntil(ctx, matchEchoOutput), "find echo output") | ||
require.ErrorIs(t, tr4.ReadUntil(ctx, nil), io.EOF) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note: original was netConn3 but I think that's copypasta
code-asher
approved these changes
Sep 19, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense!
Signed-off-by: Spike Curtis <spike@coder.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #9764
I think what's happening is that terminal control sequences are relative to the current cursor position, so by creating a new terminal emulator each time we matched, we were getting incorrect terminal state. This PR refactors so that you create one terminal emulator per reader, then match multiple times against the same emulator as you read more data.