-
Notifications
You must be signed in to change notification settings - Fork 594
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
Test rework, part 3 #3464
Test rework, part 3 #3464
Conversation
b7d49c6
to
1b7190c
Compare
1b7190c
to
a1224a3
Compare
@@ -56,54 +56,58 @@ func TestVolumePrune(t *testing.T) { | |||
} | |||
|
|||
// This set must be marked as private, since we cannot prune without interacting with other tests. | |||
testGroup := &test.Group{ |
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.
This pattern does not work here, as the Group
will run in Parallel
with other tests, breaking things for Docker.
It works with nerdctl because we are making the subtests pivate - for Docker, the subtests disable parallel, but since the parent stays parallel, it blows up.
Changing to a Test
parent instead of a group, and disabling parallel on the subtests.
28c0e5f
to
3811ad6
Compare
@AkihiroSuda this is ready - to be merged after #3455 |
@AkihiroSuda let me rebase this so we get a clean view (and might amend something). |
3811ad6
to
2339dc5
Compare
Hitting 429 with Docker Hub :-( Otherwise, this is now rebased and ready. |
Needs rebase |
Will wait for #3483 to land as the CI is currently bust. |
2339dc5
to
15ba931
Compare
15ba931
to
7aa3a85
Compare
Rebased (w. CI bustage fix) |
pkg/testutil/test/data.go
Outdated
@@ -117,16 +116,10 @@ func (dt *data) getConfig() map[ConfigKey]ConfigValue { | |||
} | |||
|
|||
func defaultIdentifierHashing(name string) string { |
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.
Why change?
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.
I did hit a case where the message was over 76, which got shortened to a sha256.
Turned out distribution registry rejected it (as an image name), as there is an undocumented limitation rejecting valid image names that are 64-byte hexadecimal strings
...
There are also plenty of cases where this fails as an image identifier (with repeat or trailing - or _)
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.
I will revert this to a readable form later (the sha1 are hurting readability) - it takes a bit more work though to handle the len limitation while keeping readability and avoiding collisions and keeping in line with id grammar.
76b50cc
to
49214a2
Compare
Rebased. CI is green (except the usual windows reg). |
Do you plan to revert the hashing func? |
Yes - here is the next round version: nerdctl/pkg/testutil/test/data.go Lines 124 to 141 in 5c240d7
This seems to bother you - if you prefer I can just backport it here right away - the thing is, this whole thing (rewrite test+tooling) is so huge that it has to be in incremental steps... I appreciate it does introduce a bit of churn, which is always unfortunate... |
As we make progress rewriting tests, the new tooling needs to adapt. In a shell, this is: - introducing (more) `Requirements`, with a better API - update documentation - fix some t.Helper calls - fix broken stdin implementation - do cleanup custom namespaces properly - change hashing function - disable "private" implying custom data root which is more trouble than is worth - minor cleanups Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
49214a2
to
2c1a5b8
Compare
Making things simpler - just backported the new version of the hashing method. Sorry for the confusion about what was meant by "later" (on this PR vs. an upcoming PR) Pending CI. |
Windows failures are the usual TestRunWithTtyAndDetached aka #3437 |
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.
Thanks
On top of #3455
Notably: