motiejus/undocker
1
Fork 0
Code Packages Releases Activity

prevent bugs in tests easier

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-24 00:11:58 +03:00
parent 25df146ca5
commit fac91d84e2
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootfs/rootfs.go
View File

@ -75,6 +75,10 @@ func RootFS(in io.ReadSeeker, out io.Writer) (err error) {
return ErrBadManifest return ErrBadManifest
} }
if len(layerOffsets) != len(manifest[0].Layers) {
return ErrBadManifest
}
// phase 1.5: enumerate layers // phase 1.5: enumerate layers
layers := make([]int64, len(layerOffsets)) layers := make([]int64, len(layerOffsets))
for i, name := range manifest[0].Layers { for i, name := range manifest[0].Layers {

39
rootfs/rootfs_test.go
View File

@ -97,35 +97,39 @@ func extract(t *testing.T, f io.Reader) []file {
} }
func TestRootFS(t *testing.T) { func TestRootFS(t *testing.T) {
_layer0 := tarball{ layer0 := tarball{
dir{name: "/", uid: 0}, dir{name: "/", uid: 0},
file{name: "/file", uid: 1, contents: []byte("from 0")}, file{name: "/file", uid: 1, contents: []byte("from 0")},
} }
_layer1 := tarball{ layer1 := tarball{
dir{name: "/", uid: 1}, dir{name: "/", uid: 1},
file{name: "/file", uid: 0, contents: []byte("from 1")}, file{name: "/file", uid: 0, contents: []byte("from 1")},
} }
_image := tarball{
file{name: "layer1/layer.tar", contents: _layer1.bytes(t)},
file{name: "layer0/layer.tar", contents: _layer0.bytes(t)},
manifest{"layer0/layer.tar", "layer1/layer.tar"},
}
tests := []struct { tests := []struct {
name string name string
image tarball image tarball
want []file want []file
wantErr string
}{ }{
{ {
name: "empty", name: "empty tarball",
image: tarball{manifest{}}, image: tarball{manifest{}},
want: []file{}, want: []file{},
}, },
{ {
name: "basic overwrite, 2 layers", name: "missing layer",
image: _image, image: tarball{manifest{"layer0/layer.tar"}},
wantErr: "bad or missing manifest.json",
},
{
name: "basic overwrite, 2 layers",
image: tarball{
file{name: "layer1/layer.tar", contents: layer1.bytes(t)},
file{name: "layer0/layer.tar", contents: layer0.bytes(t)},
manifest{"layer0/layer.tar", "layer1/layer.tar"},
},
want: []file{ want: []file{
{name: "/", uid: 1}, {name: "/", uid: 1},
{name: "/file", uid: 0, contents: []byte("from 1")}, {name: "/file", uid: 0, contents: []byte("from 1")},
@ -138,7 +142,12 @@ func TestRootFS(t *testing.T) {
in := bytes.NewReader(tt.image.bytes(t)) in := bytes.NewReader(tt.image.bytes(t))
out := bytes.Buffer{} out := bytes.Buffer{}
require.NoError(t, RootFS(in, &out)) err := RootFS(in, &out)
if tt.wantErr != "" {
assert.EqualError(t, err, tt.wantErr)
return
}
require.NoError(t, err)
got := extract(t, &out) got := extract(t, &out)
assert.Equal(t, got, tt.want) assert.Equal(t, got, tt.want)
}) })