kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix the tests, too

Browse source 
Seriously.  There's not much codebase left we haven't touched.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-02-11 19:10:23 -07:00
parent b609e28e5c
commit 0d871840b2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration/api_test.go
View file

@ -8,6 +8,7 @@ import (
"fmt" "fmt"
"github.com/dotcloud/docker" "github.com/dotcloud/docker"
"github.com/dotcloud/docker/api" "github.com/dotcloud/docker/api"
"github.com/dotcloud/docker/dockerversion"
"github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io" "io"
@ -45,7 +46,7 @@ func TestGetVersion(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
out.Close() out.Close()
expected := docker.VERSION expected := dockerversion.VERSION
if result := v.Get("Version"); result != expected { if result := v.Get("Version"); result != expected {
t.Errorf("Expected version %s, %s found", expected, result) t.Errorf("Expected version %s, %s found", expected, result)
} }

5
integration/graph_test.go
View file

@ -4,6 +4,7 @@ import (
"errors" "errors"
"github.com/dotcloud/docker" "github.com/dotcloud/docker"
"github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/dockerversion"
"github.com/dotcloud/docker/graphdriver" "github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io" "io"
@ -105,8 +106,8 @@ func TestGraphCreate(t *testing.T) {
if image.Comment != "Testing" { if image.Comment != "Testing" {
t.Fatalf("Wrong comment: should be '%s', not '%s'", "Testing", image.Comment) t.Fatalf("Wrong comment: should be '%s', not '%s'", "Testing", image.Comment)
} }
if image.DockerVersion != docker.VERSION { if image.DockerVersion != dockerversion.VERSION {
t.Fatalf("Wrong docker_version: should be '%s', not '%s'", docker.VERSION, image.DockerVersion) t.Fatalf("Wrong docker_version: should be '%s', not '%s'", dockerversion.VERSION, image.DockerVersion)
} }
images, err := graph.Map() images, err := graph.Map()
if err != nil { if err != nil {