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

nodejs: fix flaky test #358227

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Conversation

@emilazy
Copy link
Member

emilazy commented Nov 22, 2024

Maybe we should get the timeout increased upstream, since they think the issue is fixed?

@FliegendeWurst
Copy link
Member Author

Sure, I'll try. Maybe I can even drop the broken pattern of "do something + assume it is done after X ms".

@emilazy
Copy link
Member

emilazy commented Nov 22, 2024

I meant just reporting it upstream as not quite fixed would be a good step :) But thank you if you do take on the task of patching it!

@aduh95
Copy link
Contributor

aduh95 commented Nov 23, 2024

If it's caused by nodejs/node#54918 (and my guess is that it is), increasing the timeout won't help.

@FliegendeWurst
Copy link
Member Author

If it's caused by nodejs/node#54918 (and my guess is that it is), increasing the timeout won't help.

It is not, I think. My fix nodejs/node#55959 seems to work.

@aduh95
Copy link
Contributor

aduh95 commented Nov 26, 2024

Can you update this PR to cherry-pick nodejs/node@b6fe731 instead of skipping the test?

@FliegendeWurst FliegendeWurst changed the title nodejs: disable flaky test nodejs: fix flaky test Nov 26, 2024
@FliegendeWurst FliegendeWurst force-pushed the nodejs-flaky-test branch 2 times, most recently from 7915372 to e9522c2 Compare November 26, 2024 16:19
@@ -44,5 +44,10 @@ buildNodejs {
stripLen = 1;
hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
})
# fixes test failure, remove once included in release
(fetchpatch {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
(fetchpatch {
(fetchpatch2 {

Copy link
Member Author

Choose a reason for hiding this comment

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

No need. In fact I was told to use fetchpatch instead of fetchpatch2 previously, since the latter requires adding ?full_index=1

@@ -44,5 +44,10 @@ buildNodejs {
stripLen = 1;
hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
})
# fixes test failure, remove once included in release
(fetchpatch {
url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
Copy link
Contributor

@aduh95 aduh95 Nov 26, 2024

Choose a reason for hiding this comment

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

Suggested change
url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch";
url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1";

We need the ?full_index=1 so the patch is stable (otherwise it might change as GitHub updates the length of the index as the upstream repo grows)

Copy link
Member

@emilazy emilazy Nov 26, 2024

Choose a reason for hiding this comment

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

Not with fetchpatch (rather than fetchpatch2), as it turns out. You get to choose between stripping index lines properly and handling renames…

(But it probably makes sense to keep to fetchpatch2 in these files since they’re already using it?)

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 26, 2024
@ofborg ofborg bot requested a review from aduh95 November 27, 2024 11:33
@emilazy emilazy merged commit e1036e4 into NixOS:staging Nov 27, 2024
30 of 32 checks passed
@emilazy
Copy link
Member

emilazy commented Nov 27, 2024

I suppose we should backport this?

@FliegendeWurst FliegendeWurst added the backport staging-24.11 Backport PR automatically label Nov 27, 2024
Copy link
Contributor

Backport failed for staging-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-24.11
git worktree add -d .worktree/backport-358227-to-staging-24.11 origin/staging-24.11
cd .worktree/backport-358227-to-staging-24.11
git switch --create backport-358227-to-staging-24.11
git cherry-pick -x f634fa26cc24f7a32913f5c6d8afedcfd80116eb

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

Successfully merging this pull request may close these issues.

4 participants