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.

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

[JENKINS-54346] && [JENKINS-55505] Fix stream handling in tee (followup) #77

Merged
merged 8 commits into from
Jun 26, 2020
Merged

[JENKINS-54346] && [JENKINS-55505] Fix stream handling in tee (followup) #77

merged 8 commits into from
Jun 26, 2020

Conversation

PhilippHomann
Copy link
Contributor

This is just a followup of #62
Most credits of changes going out to @tolnaisz

Just fixed the test error mentioned in #62

Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scarcely remember the considerations at this point, but I think this was basically right.

which is also guaranteeing backward compatibility when resuming after plug-in upgrade.
*/
transferredToRemote = Channel.current() != null;
oos.defaultWriteObject();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the original PR I suggested that this be rewritten to use writeReplace for legibility and maintainability, but I do not consider it a blocker.

@Test
@Issue({"JENKINS-54346", "JENKINS-55505"})
public void closed() throws Exception {
rr.then(r -> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still no test coverage of behavior across restarts that I can tell.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my last commit.
Is that what you expect?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like that, yes. I would have to immerse myself in this patch for a while to really remember what the tricky cases were.

PhilippHomann and others added 2 commits June 16, 2020 09:22
Signed-off-by: Philipp Homann <homann.philipp@googlemail.com>
Co-authored-by: Jesse Glick <jglick@cloudbees.com>
@rsandell rsandell added the bug label Jun 26, 2020
@rsandell rsandell merged commit 98681ab into jenkinsci:master Jun 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants