mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
6052f2b396
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>
83 lines
2.6 KiB
Go
83 lines
2.6 KiB
Go
package dockerfile
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/builder"
|
|
"github.com/docker/docker/pkg/archive"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestEmptyDockerfile(t *testing.T) {
|
|
contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
|
|
defer cleanup()
|
|
|
|
createTestTempFile(t, contextDir, builder.DefaultDockerfileName, "", 0777)
|
|
|
|
readAndCheckDockerfile(t, "emptyDockerfile", contextDir, "", "The Dockerfile (Dockerfile) cannot be empty")
|
|
}
|
|
|
|
func TestSymlinkDockerfile(t *testing.T) {
|
|
contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
|
|
defer cleanup()
|
|
|
|
createTestSymlink(t, contextDir, builder.DefaultDockerfileName, "/etc/passwd")
|
|
|
|
// The reason the error is "Cannot locate specified Dockerfile" is because
|
|
// in the builder, the symlink is resolved within the context, therefore
|
|
// Dockerfile -> /etc/passwd becomes etc/passwd from the context which is
|
|
// a nonexistent file.
|
|
expectedError := fmt.Sprintf("Cannot locate specified Dockerfile: %s", builder.DefaultDockerfileName)
|
|
|
|
readAndCheckDockerfile(t, "symlinkDockerfile", contextDir, builder.DefaultDockerfileName, expectedError)
|
|
}
|
|
|
|
func TestDockerfileOutsideTheBuildContext(t *testing.T) {
|
|
contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
|
|
defer cleanup()
|
|
|
|
expectedError := "Forbidden path outside the build context: ../../Dockerfile ()"
|
|
|
|
readAndCheckDockerfile(t, "DockerfileOutsideTheBuildContext", contextDir, "../../Dockerfile", expectedError)
|
|
}
|
|
|
|
func TestNonExistingDockerfile(t *testing.T) {
|
|
contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
|
|
defer cleanup()
|
|
|
|
expectedError := "Cannot locate specified Dockerfile: Dockerfile"
|
|
|
|
readAndCheckDockerfile(t, "NonExistingDockerfile", contextDir, "Dockerfile", expectedError)
|
|
}
|
|
|
|
func readAndCheckDockerfile(t *testing.T, testName, contextDir, dockerfilePath, expectedError string) {
|
|
tarStream, err := archive.Tar(contextDir, archive.Uncompressed)
|
|
require.NoError(t, err)
|
|
|
|
defer func() {
|
|
if err = tarStream.Close(); err != nil {
|
|
t.Fatalf("Error when closing tar stream: %s", err)
|
|
}
|
|
}()
|
|
|
|
context, err := builder.MakeTarSumContext(tarStream)
|
|
require.NoError(t, err)
|
|
|
|
defer func() {
|
|
if err = context.Close(); err != nil {
|
|
t.Fatalf("Error when closing tar context: %s", err)
|
|
}
|
|
}()
|
|
|
|
options := &types.ImageBuildOptions{
|
|
Dockerfile: dockerfilePath,
|
|
}
|
|
|
|
b := &Builder{options: options, context: context}
|
|
|
|
_, err = b.readAndParseDockerfile()
|
|
assert.EqualError(t, err, expectedError)
|
|
}
|