Merge testutil/pkgdata-* branches and resolve conflicts #84
Conversation
This file contains 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
This was referenced Jun 21, 2023
MakeDeb() now expects that all provided tar entries have a non-empty name. Otherwise it panics on array out of bounds access. Fix it. We can create tarballs containing entries with empty name just fine. It makes GNU tar fail when extracting, but it fails gracefully with tar: Substituting `.' for empty member name -rw-r--r-- root/root 0 1970-01-01 01:00 tar: .: Cannot open: File exists tar: Exiting with failure status due to previous errors
Add MakeTestDeb() function to testutil/pkgdata. This function is just
like MakeDeb() except that it doesn't return an error. Instead, it
panics on errors.
This is useful in tests where package data is created in top-level test
case structures where we don't need to handle the error, e.g.:
var testCases = []TestCase{{
pkg: MakeTestDeb([]TarEntry{
...
}),
}, {
...
}}
Introduce shorthand constructors for testutil.TarEntry structures. These
are REG(), DIR() and LNK() functions.
The rationale for this addition is to make the test case definition less
verbose. There are other changes in the queue that construct custom
packages to test various test cases. In all these new tests (and old
ones as well) we only care about file's type, path, mode and content.
With these shorthand constructors and function aliases we can define tar
entries like:
DIR(0755, "./data/"),
REG(0600, "./data/document.txt", "words words words"),
LNK(0777, "./data/document", "document.txt"),
Instead of:
testutil.TarEntry{
Header: tar.Header{
Name: "./data/",
Mode: 0755,
},
},
testutil.TarEntry{
Header: tar.Header{
Name: "./document.txt",
Mode: 0600,
},
Content: []byte("words words words"),
},
testutil.TarEntry{
Header: tar.Header{
Name: "./document.txt",
Mode: 0777,
Linkname: "document.txt",
},
},
The reason for the 3 letter names and the order of arguments is to make
the list of paths aligned on the same column in tarball definitions.
These function only create barebone TarEntry. It'll still get adjusted
when passed through fixupTarEntry().
…ata-test-deb' and 'pub/testutil-pkgdata-shorthands' into pub/testutil-pkgdata
woky
force-pushed
the
pub/testutil-pkgdata
branch
from
4ca61c1 to
95c51be
Compare
woky
changed the title
|
This merge is not required anymore. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge and fix conflicts in unrelated changes to testutil.pkgdata.