pkg/docker/config/config_test: Stabilize "normalize registry" test #626
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In 1c0fb51 (pkg/docker/config/testdata: Add credential-file fixtures, 2019-02-28, containers#593), I changed the test data for this test from: makeTestAuthConfig(testAuthConfigDataMap{ "docker.io": testAuthConfigData{"user", "pw"}, "localhost:5000": testAuthConfigData{"joe", "pass"}, }) to the full.json fixture which includes: { "auths": { "example.org": { "auth": "ZXhhbXBsZTpvcmc=" }, "index.docker.io": { "auth": "aW5kZXg6ZG9ja2VyLmlv" }, "docker.io": { "auth": "ZG9ja2VyOmlv" }, ... } } That lead ordering instability matching the normalized docker.io, with it occasionally matching the expected docker.io entry, and occasionally matching the index.docker.io entry. With this commit, I'm adjusting the hostname to be based on example.org to avoid such ambiguity in target matching while still excercising all the normalization logic that was being excercised before 1c0fb51. Signed-off-by: W. Trevor King <wking@tremily.us>
Contributor
Author
|
Checking for flake-fixing-ness: $ go test -count 100 ./pkg/docker/config
ok github.com/containers/image/pkg/docker/config 0.377s |
Collaborator
|
@vrothberg PTAL; consider also #624. (This fix seems correct to me, FWIW.) |
Member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In 1c0fb51 (#593), I changed the test data for this test from:
to the
full.jsonfixture which includes:{ "auths": { "example.org": { "auth": "ZXhhbXBsZTpvcmc=" }, "index.docker.io": { "auth": "aW5kZXg6ZG9ja2VyLmlv" }, "docker.io": { "auth": "ZG9ja2VyOmlv" }, ... } }That lead ordering instability matching the normalized
docker.io, with it occasionally matching the expecteddocker.ioentry, and occasionally matching theindex.docker.ioentry. With this commit, I'm adjusting the hostname to be based onexample.orgto avoid such ambiguity in target matching while still excercising all the normalization logic that was being excercised before 1c0fb51.