Revert "pkg/docker/config/testdata: Add credential-file fixtures" #624
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
Contributor
|
Fix for the flake in #626, as an alternative to the revert here. |
This reverts commit 1c0fb51. That commit introduces a flake (depending on in which order normalizedAuths are processed): --- FAIL: TestGetAuth (0.01s) config_test.go:71: using temporary XDG_RUNTIME_DIR directory: "/var/folders/14/d3kqjd4d57q1bff3sph57ks80000gn/T/test_docker_client_get_auth799396144" config_test.go:87: using temporary home directory: "/var/folders/14/d3kqjd4d57q1bff3sph57ks80000gn/T/test_docker_client_get_auth026490575" --- FAIL: TestGetAuth/normalize_registry#01 (0.00s) Error Trace: config_test.go:218 Error: Not equal: expected: "docker" received: "index" Error Trace: config_test.go:219 Error: Not equal: expected: "io" received: "docker.io" FAIL FAIL github.com/containers/image/pkg/docker/config 0.121s While the commit says “add fixtures”, it seems that not a single affected test case has actually been just ported without modification, and there’s no rationale for those modifications. So, while moving to fixtures instead of autogenerating data, and the use of t.Run and assert.Equal, are, as such, certainly valuable, this is all, along with the test suite changes, conflated in a single commit, so it’s not trivially easy to preserve the useful parts without the parts that may need more discussion; I’m afraid I'm going to revert all of this for now. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Collaborator
Author
|
@vrothberg PTAL; consider also #626. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This reverts commit 1c0fb51 (#593 ).
That commit introduces a flake (depending on in which order normalizedAuths are processed):
While the commit says “add fixtures”, it seems that not a single affected test case has actually been just ported without modification, and there’s no rationale for those modifications. So, while moving to fixtures instead of autogenerating data, and the use of t.Run and assert.Equal, are, as such, certainly valuable, this is all, along with the test suite changes, conflated in a single commit, so it’s not trivially easy to preserve the useful parts without the parts that may need more discussion; I’m afraid I’m going to revert all of this for now.