Browse code

Fix the tests, too

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)

Tianon Gravi authored on 2014/02/12 11:10:23
Showing 2 changed files
... ...
@@ -8,6 +8,7 @@ import (
8 8
 	"fmt"
9 9
 	"github.com/dotcloud/docker"
10 10
 	"github.com/dotcloud/docker/api"
11
+	"github.com/dotcloud/docker/dockerversion"
11 12
 	"github.com/dotcloud/docker/engine"
12 13
 	"github.com/dotcloud/docker/utils"
13 14
 	"io"
... ...
@@ -45,7 +46,7 @@ func TestGetVersion(t *testing.T) {
45 45
 		t.Fatal(err)
46 46
 	}
47 47
 	out.Close()
48
-	expected := docker.VERSION
48
+	expected := dockerversion.VERSION
49 49
 	if result := v.Get("Version"); result != expected {
50 50
 		t.Errorf("Expected version %s, %s found", expected, result)
51 51
 	}
... ...
@@ -4,6 +4,7 @@ import (
4 4
 	"errors"
5 5
 	"github.com/dotcloud/docker"
6 6
 	"github.com/dotcloud/docker/archive"
7
+	"github.com/dotcloud/docker/dockerversion"
7 8
 	"github.com/dotcloud/docker/graphdriver"
8 9
 	"github.com/dotcloud/docker/utils"
9 10
 	"io"
... ...
@@ -105,8 +106,8 @@ func TestGraphCreate(t *testing.T) {
105 105
 	if image.Comment != "Testing" {
106 106
 		t.Fatalf("Wrong comment: should be '%s', not '%s'", "Testing", image.Comment)
107 107
 	}
108
-	if image.DockerVersion != docker.VERSION {
109
-		t.Fatalf("Wrong docker_version: should be '%s', not '%s'", docker.VERSION, image.DockerVersion)
108
+	if image.DockerVersion != dockerversion.VERSION {
109
+		t.Fatalf("Wrong docker_version: should be '%s', not '%s'", dockerversion.VERSION, image.DockerVersion)
110 110
 	}
111 111
 	images, err := graph.Map()
112 112
 	if err != nil {