mirror of
https://github.com/clearlinux/docker.git
synced 2026-09-06 13:41:36 +00:00
Use suite for integration-cli
It prints test name and duration for each test. Also performs deleteAllContainers after each test. Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
@@ -3,50 +3,50 @@ package main
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/url"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/go-check/check"
|
||||
)
|
||||
|
||||
func TestLegacyImages(t *testing.T) {
|
||||
func (s *DockerSuite) TestLegacyImages(c *check.C) {
|
||||
_, body, err := sockRequest("GET", "/v1.6/images/json", nil)
|
||||
if err != nil {
|
||||
t.Fatalf("Error on GET: %s", err)
|
||||
c.Fatalf("Error on GET: %s", err)
|
||||
}
|
||||
|
||||
images := []types.LegacyImage{}
|
||||
if err = json.Unmarshal(body, &images); err != nil {
|
||||
t.Fatalf("Error on unmarshal: %s", err)
|
||||
c.Fatalf("Error on unmarshal: %s", err)
|
||||
}
|
||||
|
||||
if len(images) == 0 || images[0].Tag == "" || images[0].Repository == "" {
|
||||
t.Fatalf("Bad data: %q", images)
|
||||
c.Fatalf("Bad data: %q", images)
|
||||
}
|
||||
|
||||
logDone("images - checking legacy json")
|
||||
}
|
||||
|
||||
func TestApiImagesFilter(t *testing.T) {
|
||||
func (s *DockerSuite) TestApiImagesFilter(c *check.C) {
|
||||
name := "utest:tag1"
|
||||
name2 := "utest/docker:tag2"
|
||||
name3 := "utest:5000/docker:tag3"
|
||||
defer deleteImages(name, name2, name3)
|
||||
dockerCmd(t, "tag", "busybox", name)
|
||||
dockerCmd(t, "tag", "busybox", name2)
|
||||
dockerCmd(t, "tag", "busybox", name3)
|
||||
|
||||
for _, n := range []string{name, name2, name3} {
|
||||
if out, err := exec.Command(dockerBinary, "tag", "busybox", n).CombinedOutput(); err != nil {
|
||||
c.Fatal(err, out)
|
||||
}
|
||||
}
|
||||
type image struct{ RepoTags []string }
|
||||
getImages := func(filter string) []image {
|
||||
v := url.Values{}
|
||||
v.Set("filter", filter)
|
||||
_, b, err := sockRequest("GET", "/images/json?"+v.Encode(), nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
c.Fatal(err)
|
||||
}
|
||||
var images []image
|
||||
if err := json.Unmarshal(b, &images); err != nil {
|
||||
t.Fatal(err)
|
||||
c.Fatal(err)
|
||||
}
|
||||
|
||||
return images
|
||||
@@ -54,48 +54,49 @@ func TestApiImagesFilter(t *testing.T) {
|
||||
|
||||
errMsg := "incorrect number of matches returned"
|
||||
if images := getImages("utest*/*"); len(images[0].RepoTags) != 2 {
|
||||
t.Fatal(errMsg)
|
||||
c.Fatal(errMsg)
|
||||
}
|
||||
if images := getImages("utest"); len(images[0].RepoTags) != 1 {
|
||||
t.Fatal(errMsg)
|
||||
c.Fatal(errMsg)
|
||||
}
|
||||
if images := getImages("utest*"); len(images[0].RepoTags) != 1 {
|
||||
t.Fatal(errMsg)
|
||||
c.Fatal(errMsg)
|
||||
}
|
||||
if images := getImages("*5000*/*"); len(images[0].RepoTags) != 1 {
|
||||
t.Fatal(errMsg)
|
||||
c.Fatal(errMsg)
|
||||
}
|
||||
|
||||
logDone("images - filter param is applied")
|
||||
}
|
||||
|
||||
func TestApiImagesSaveAndLoad(t *testing.T) {
|
||||
testRequires(t, Network)
|
||||
func (s *DockerSuite) TestApiImagesSaveAndLoad(c *check.C) {
|
||||
testRequires(c, Network)
|
||||
out, err := buildImage("saveandload", "FROM hello-world\nENV FOO bar", false)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
c.Fatal(err)
|
||||
}
|
||||
id := strings.TrimSpace(out)
|
||||
defer deleteImages("saveandload")
|
||||
|
||||
_, body, err := sockRequestRaw("GET", "/images/"+id+"/get", nil, "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
c.Fatal(err)
|
||||
}
|
||||
defer body.Close()
|
||||
|
||||
dockerCmd(t, "rmi", id)
|
||||
if out, err := exec.Command(dockerBinary, "rmi", id).CombinedOutput(); err != nil {
|
||||
c.Fatal(err, out)
|
||||
}
|
||||
|
||||
_, loadBody, err := sockRequestRaw("POST", "/images/load", body, "application/x-tar")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
c.Fatal(err)
|
||||
}
|
||||
defer loadBody.Close()
|
||||
|
||||
out, _ = dockerCmd(t, "inspect", "--format='{{ .Id }}'", id)
|
||||
if strings.TrimSpace(out) != id {
|
||||
t.Fatal("load did not work properly")
|
||||
inspectOut, err := exec.Command(dockerBinary, "inspect", "--format='{{ .Id }}'", id).CombinedOutput()
|
||||
if err != nil {
|
||||
c.Fatal(err, inspectOut)
|
||||
}
|
||||
if strings.TrimSpace(string(inspectOut)) != id {
|
||||
c.Fatal("load did not work properly")
|
||||
}
|
||||
|
||||
logDone("images API - save and load")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user