Merge pull request #6165 from vieux/update_tests

Update tests regarding busybox & inspect

integration-cli/docker_cli_pull_test.go

@@ -8,7 +8,7 @@ import (
 
 // pulling an image from the central registry should work
 func TestPullImageFromCentralRegistry(t *testing.T) {
-	pullCmd := exec.Command(dockerBinary, "pull", "busybox")
+	pullCmd := exec.Command(dockerBinary, "pull", "busybox:latest")
 	out, exitCode, err := runCommandWithOutput(pullCmd)
 	errorOut(err, t, fmt.Sprintf("%s %s", out, err))
 

integration/runtime_test.go

@@ -133,10 +133,10 @@ func init() {
 
 func setupBaseImage() {
 	eng := newTestEngine(log.New(os.Stderr, "", 0), false, unitTestStoreBase)
-	job := eng.Job("inspect", unitTestImageName, "image")
+	job := eng.Job("image_inspect", unitTestImageName)
 	img, _ := job.Stdout.AddEnv()
 	// If the unit test is not found, try to download it.
-	if err := job.Run(); err != nil || img.Get("id") != unitTestImageID {
+	if err := job.Run(); err != nil || img.Get("Id") != unitTestImageID {
 		// Retrieve the Image
 		job = eng.Job("pull", unitTestImageName)
 		job.Stdout.Add(utils.NopWriteCloser(os.Stdout))