Merge pull request #6926 from LK4D4/log_for_tar_test

Simple additions to TestBuildAddTar
This commit is contained in:
Tibor Vass 2014-07-09 11:40:55 -04:00
Родитель 65a5dde38b fc2631b499
Коммит aec8d90462
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -1733,7 +1733,8 @@ RUN [ "$(cat /testfile)" = 'test!' ]`
}
func TestBuildAddTar(t *testing.T) {
name := "testbuildaddtar"
defer deleteImages(name)
checkOutput := func(out string) {
n := -1
x := ""
@ -1756,10 +1757,11 @@ func TestBuildAddTar(t *testing.T) {
for _, n := range []string{"1", "2"} {
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildAddTar", n)
buildCmd := exec.Command(dockerBinary, "build", "-t", "testbuildaddtar", ".")
buildCmd := exec.Command(dockerBinary, "build", "-t", name, ".")
buildCmd.Dir = buildDirectory
out, _, err := runCommandWithOutput(buildCmd)
errorOut(err, t, fmt.Sprintf("build failed to complete for TestBuildAddTar/%s: %v", n, err))
checkOutput(out)
}
logDone("build - ADD tar")
}