@@ -319,6 +319,43 @@ func TestGetImagesHistory(t *testing.T) {

 	}

 }

+func TestGetImagesByName(t *testing.T) {

+	eng := engine.New()

+	name := "image_name"

+	var called bool

+	eng.Register("image_inspect", func(job *engine.Job) engine.Status {

+		called = true

+		if job.Args[0] != name {

+			t.Fatalf("name != '%s': %#v", name, job.Args[0])

+		}

+		if api.APIVERSION.LessThan("1.12") && !job.GetenvBool("dirty") {

+			t.Fatal("dirty env variable not set")

+		} else if api.APIVERSION.GreaterThanOrEqualTo("1.12") && job.GetenvBool("dirty") {

+			t.Fatal("dirty env variable set when it shouldn't")

+		}

+		v := &engine.Env{}

+		v.SetBool("dirty", true)

+		if _, err := v.WriteTo(job.Stdout); err != nil {

+			return job.Error(err)

+		}

+		return engine.StatusOK

+	})

+	r := serveRequest("GET", "/images/"+name+"/json", nil, eng, t)

+	if !called {

+		t.Fatal("handler was not called")

+	}

+	if r.HeaderMap.Get("Content-Type") != "application/json" {

+		t.Fatalf("%#v\n", r)

+	}

+	var stdoutJson interface{}

+	if err := json.Unmarshal(r.Body.Bytes(), &stdoutJson); err != nil {

+		t.Fatalf("%#v", err)

+	}

+	if stdoutJson.(map[string]interface{})["dirty"].(float64) != 1 {

+		t.Fatalf("%#v", stdoutJson)

+	}

+}

+

 func serveRequest(method, target string, body io.Reader, eng *engine.Engine, t *testing.T) *httptest.ResponseRecorder {

 	r := httptest.NewRecorder()

 	req, err := http.NewRequest(method, target, body)

new file mode 100644

@@ -0,0 +1,22 @@

+package main

+

+import (

+	"os/exec"

+	"strings"

+	"testing"

+)

+

+func TestInspectImage(t *testing.T) {

+	imageTest := "scratch"

+	imageTestId := "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158"

+	imagesCmd := exec.Command(dockerBinary, "inspect", "--format='{{.Id}}'", imageTest)

+

+	out, exitCode, err := runCommandWithOutput(imagesCmd)

+	if exitCode != 0 || err != nil {

+		t.Fatalf("failed to inspect image")

+	}

+	if id := strings.TrimSuffix(out, "\n"); id != imageTestId {

+		t.Fatalf("Expected id: %s for image: %s but received id: %s", imageTestId, imageTest, id)

+	}

+	logDone("inspect - inspect an image")

+}

@@ -16,7 +16,6 @@ import (

 	"github.com/dotcloud/docker/api"

 	"github.com/dotcloud/docker/api/server"

 	"github.com/dotcloud/docker/engine"

-	"github.com/dotcloud/docker/image"

 	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"

 )

@@ -124,30 +123,6 @@ func TestGetImagesJSON(t *testing.T) {

 	}

 }

-func TestGetImagesByName(t *testing.T) {

-	eng := NewTestEngine(t)

-	defer mkDaemonFromEngine(eng, t).Nuke()

-

-	req, err := http.NewRequest("GET", "/images/"+unitTestImageName+"/json", nil)

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	r := httptest.NewRecorder()

-	if err := server.ServeRequest(eng, api.APIVERSION, r, req); err != nil {

-		t.Fatal(err)

-	}

-	assertHttpNotError(r, t)

-

-	img := &image.Image{}

-	if err := json.Unmarshal(r.Body.Bytes(), img); err != nil {

-		t.Fatal(err)

-	}

-	if img.ID != unitTestImageID {

-		t.Errorf("Error inspecting image")

-	}

-}

-

 func TestGetContainersJSON(t *testing.T) {

 	eng := NewTestEngine(t)

 	defer mkDaemonFromEngine(eng, t).Nuke()