kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove pkg/testutil/assert in favor of testify

Browse source 
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.

I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.

In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.

In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2017-04-13 15:45:37 -07:00
parent 41f4c3cf7e
commit 6052f2b396
102 changed files with 2305 additions and 1143 deletions
Download patch file Download diff file Expand all files Collapse all files

97
image/store_test.go
View file

@ -4,8 +4,9 @@ import (
"testing"
"github.com/docker/docker/layer"
"github.com/docker/docker/pkg/testutil/assert"
"github.com/docker/docker/pkg/testutil"
"github.com/opencontainers/go-digest"
"github.com/stretchr/testify/assert"
)
func TestRestore(t *testing.T) {
@ -13,55 +14,55 @@ func TestRestore(t *testing.T) {
defer cleanup()
id1, err := fs.Set([]byte(`{"comment": "abc", "rootfs": {"type": "layers"}}`))
assert.NilError(t, err)
assert.NoError(t, err)
_, err = fs.Set([]byte(`invalid`))
assert.NilError(t, err)
assert.NoError(t, err)
id2, err := fs.Set([]byte(`{"comment": "def", "rootfs": {"type": "layers", "diff_ids": ["2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"]}}`))
assert.NilError(t, err)
assert.NoError(t, err)
err = fs.SetMetadata(id2, "parent", []byte(id1))
assert.NilError(t, err)
assert.NoError(t, err)
is, err := NewImageStore(fs, &mockLayerGetReleaser{})
assert.NilError(t, err)
assert.NoError(t, err)
assert.Equal(t, len(is.Map()), 2)
assert.Len(t, is.Map(), 2)
img1, err := is.Get(ID(id1))
assert.NilError(t, err)
assert.Equal(t, img1.computedID, ID(id1))
assert.Equal(t, img1.computedID.String(), string(id1))
assert.NoError(t, err)
assert.Equal(t, ID(id1), img1.computedID)
assert.Equal(t, string(id1), img1.computedID.String())
img2, err := is.Get(ID(id2))
assert.NilError(t, err)
assert.Equal(t, img1.Comment, "abc")
assert.Equal(t, img2.Comment, "def")
assert.NoError(t, err)
assert.Equal(t, "abc", img1.Comment)
assert.Equal(t, "def", img2.Comment)
p, err := is.GetParent(ID(id1))
assert.Error(t, err, "failed to read metadata")
testutil.ErrorContains(t, err, "failed to read metadata")
p, err = is.GetParent(ID(id2))
assert.NilError(t, err)
assert.Equal(t, p, ID(id1))
assert.NoError(t, err)
assert.Equal(t, ID(id1), p)
children := is.Children(ID(id1))
assert.Equal(t, len(children), 1)
assert.Equal(t, children[0], ID(id2))
assert.Equal(t, len(is.Heads()), 1)
assert.Len(t, children, 1)
assert.Equal(t, ID(id2), children[0])
assert.Len(t, is.Heads(), 1)
sid1, err := is.Search(string(id1)[:10])
assert.NilError(t, err)
assert.Equal(t, sid1, ID(id1))
assert.NoError(t, err)
assert.Equal(t, ID(id1), sid1)
sid1, err = is.Search(digest.Digest(id1).Hex()[:6])
assert.NilError(t, err)
assert.Equal(t, sid1, ID(id1))
assert.NoError(t, err)
assert.Equal(t, ID(id1), sid1)
invalidPattern := digest.Digest(id1).Hex()[1:6]
_, err = is.Search(invalidPattern)
assert.Error(t, err, "No such image")
testutil.ErrorContains(t, err, "No such image")
}
func TestAddDelete(t *testing.T) {
@ -69,34 +70,34 @@ func TestAddDelete(t *testing.T) {
defer cleanup()
id1, err := is.Create([]byte(`{"comment": "abc", "rootfs": {"type": "layers", "diff_ids": ["2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"]}}`))
assert.NilError(t, err)
assert.Equal(t, id1, ID("sha256:8d25a9c45df515f9d0fe8e4a6b1c64dd3b965a84790ddbcc7954bb9bc89eb993"))
assert.NoError(t, err)
assert.Equal(t, ID("sha256:8d25a9c45df515f9d0fe8e4a6b1c64dd3b965a84790ddbcc7954bb9bc89eb993"), id1)
img, err := is.Get(id1)
assert.NilError(t, err)
assert.Equal(t, img.Comment, "abc")
assert.NoError(t, err)
assert.Equal(t, "abc", img.Comment)
id2, err := is.Create([]byte(`{"comment": "def", "rootfs": {"type": "layers", "diff_ids": ["2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"]}}`))
assert.NilError(t, err)
assert.NoError(t, err)
err = is.SetParent(id2, id1)
assert.NilError(t, err)
assert.NoError(t, err)
pid1, err := is.GetParent(id2)
assert.NilError(t, err)
assert.NoError(t, err)
assert.Equal(t, pid1, id1)
_, err = is.Delete(id1)
assert.NilError(t, err)
assert.NoError(t, err)
_, err = is.Get(id1)
assert.Error(t, err, "failed to get digest")
testutil.ErrorContains(t, err, "failed to get digest")
_, err = is.Get(id2)
assert.NilError(t, err)
assert.NoError(t, err)
_, err = is.GetParent(id2)
assert.Error(t, err, "failed to read metadata")
testutil.ErrorContains(t, err, "failed to read metadata")
}
func TestSearchAfterDelete(t *testing.T) {
@ -104,17 +105,17 @@ func TestSearchAfterDelete(t *testing.T) {
defer cleanup()
id, err := is.Create([]byte(`{"comment": "abc", "rootfs": {"type": "layers"}}`))
assert.NilError(t, err)
assert.NoError(t, err)
id1, err := is.Search(string(id)[:15])
assert.NilError(t, err)
assert.NoError(t, err)
assert.Equal(t, id1, id)
_, err = is.Delete(id)
assert.NilError(t, err)
assert.NoError(t, err)
_, err = is.Search(string(id)[:15])
assert.Error(t, err, "No such image")
testutil.ErrorContains(t, err, "No such image")
}
func TestParentReset(t *testing.T) {
@ -122,27 +123,27 @@ func TestParentReset(t *testing.T) {
defer cleanup()
id, err := is.Create([]byte(`{"comment": "abc1", "rootfs": {"type": "layers"}}`))
assert.NilError(t, err)
assert.NoError(t, err)
id2, err := is.Create([]byte(`{"comment": "abc2", "rootfs": {"type": "layers"}}`))
assert.NilError(t, err)
assert.NoError(t, err)
id3, err := is.Create([]byte(`{"comment": "abc3", "rootfs": {"type": "layers"}}`))
assert.NilError(t, err)
assert.NoError(t, err)
assert.NilError(t, is.SetParent(id, id2))
assert.Equal(t, len(is.Children(id2)), 1)
assert.NoError(t, is.SetParent(id, id2))
assert.Len(t, is.Children(id2), 1)
assert.NilError(t, is.SetParent(id, id3))
assert.Equal(t, len(is.Children(id2)), 0)
assert.Equal(t, len(is.Children(id3)), 1)
assert.NoError(t, is.SetParent(id, id3))
assert.Len(t, is.Children(id2), 0)
assert.Len(t, is.Children(id3), 1)
}
func defaultImageStore(t *testing.T) (Store, func()) {
fsBackend, cleanup := defaultFSStoreBackend(t)
store, err := NewImageStore(fsBackend, &mockLayerGetReleaser{})
assert.NilError(t, err)
assert.NoError(t, err)
return store, cleanup
}