-
Notifications
You must be signed in to change notification settings - Fork 710
A dumber approach to reverting #7995 on 3.8 branch #8319
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
Conversation
This reverts commit 91fa33b.
This reverts commit 97f2c7b.
This reverts commit d5ae20c.
This reverts commit 9d33338.
This reverts commit 3aa45a2.
This reverts commit 200478e.
This reverts commit 1969327.
This reverts commit f972102.
This reverts commit a5986e3.
This reverts commit eefe45d.
This reverts commit 592a48e.
Let's hope your version works. I remember CI was a flaky with that test, but it's better than failing every time. I'm trying another hack, but at this point it's failing outright. :) |
bbbd5b1
to
65063a7
Compare
This really failed hard with "*** Exception: unexpected: done sleeping", so changing the test harness doesn't seem to be sufficient. The cleanup probably fixed the real code that is used in the test. I will try your idea and revert the change of the test #8081 that adjusts it to the revised code (that we are reverting here). |
The same failure with #8081 reverted, so I'm just going to mark the test as known broken. It was flaky before. |
Here's the list of commits that you'd want to revert. It's not a good idea to keep #7921 if reverting #7995, that's very likely to break things.
|
OK, let's do that in yet another PR. |
Tried it, at least not conflicts this time... |
Done on #8321. |
CI passed fine, but closing in favour of #8321. |
A dumber (commit by commit) approach to reverting #7995 on 3.8 branch. This is made painful by the fact that we got sloppy and didn't rebase a subsequent PR and so the overall merge got complex instead of fast-forward. Also, some other PRs (at least one, but probably more) actually depend on this PR.
Manual hacks notes:
rawSystemProcAction
andfromCreatePipe
in the revert of Rework subprocess helpers, because they were causing a conflict and indeed they are used in some subsequent PRs