Skip to content

Chores#3564

Merged
AkihiroSuda merged 3 commits intocontainerd:mainfrom
apostasie:chores
Oct 18, 2024
Merged

Chores#3564
AkihiroSuda merged 3 commits intocontainerd:mainfrom
apostasie:chores

Conversation

@apostasie
Copy link
Copy Markdown
Contributor

@apostasie apostasie commented Oct 17, 2024

  • duplicated title test fixed
  • marking / unmarking tests as flaky based on recent runs
  • spurious comments
  • (useless) leftovers from previous iteration in referenceutils_tests

This contains some changes broken out of #3550 (while it is being reviewed, we can still get these in and I will rebase)

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@apostasie apostasie changed the title [WIP] Chores Chores Oct 17, 2024
@apostasie apostasie marked this pull request as ready for review October 17, 2024 21:05
- containerd#3512 is likely fixed, so, deflaking test
- a couple of other circumstances failed the build (one of them with Docker) - commenting in-line
- marking another instance of containerd#3524

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Comment on lines +122 to +125
testCase.Require = test.Require(
testCase.Require,
nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3524"),
)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

can you explain this a bit?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sure.

On windows, this may fail (randomly) - detailed in the linked ticket.

nerdtest.IsFlaky("issue link") is part of the new test framework (https://github.com/containerd/nerdctl/blob/main/docs/testing/tools.md#requirements)

It marks a test as flaky, which makes it run only if -test.only-flaky is provided to the integration test.
Very soon, with PR #3535 we will have separate steps to run non-flaky (no retries, hard failure) and flaky tests (retries, hard fail only if all retries fail).

Now, this test also has a requirement of not(docker):

Require: test.Not(nerdtest.Docker),

and I do not want that to get overridden here (otherwise, if ran on windows against target docker, the test would not be skipped).

test.Require(reqs...) is a helper that just bundles together a set of requirements (the previous one testCase.Require, and the conditional one IsFlaky).

Lmk if that does not clarify or if your question was about something I missed?

Thanks @djdongjin

@djdongjin djdongjin added this to the v2.0.0 milestone Oct 17, 2024
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 388fe79 into containerd:main Oct 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants