daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapted tests to latest registry changes

master
shin- 2013-08-05 20:28:05 +02:00
parent 5ea461f300
commit 03c1bbbf65
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docs/registry_test.go
View File

@ -2,6 +2,7 @@ package registry
import ( import (
"github.com/dotcloud/docker/auth" "github.com/dotcloud/docker/auth"
"github.com/dotcloud/docker/utils"
"strings" "strings"
"testing" "testing"
) )
@ -12,27 +13,9 @@ var (
REPO = "foo42/bar" REPO = "foo42/bar"
) )
type simpleVersionInfo struct {
name string
version string
}
func (v *simpleVersionInfo) Name() string {
return v.name
}
func (v *simpleVersionInfo) Version() string {
return v.version
}
func spawnTestRegistry(t *testing.T) *Registry { func spawnTestRegistry(t *testing.T) *Registry {
versionInfo := make([]VersionInfo, 0, 4)
versionInfo = append(versionInfo, &simpleVersionInfo{"docker", "0.0.0test"})
versionInfo = append(versionInfo, &simpleVersionInfo{"go", "test"})
versionInfo = append(versionInfo, &simpleVersionInfo{"git-commit", "test"})
versionInfo = append(versionInfo, &simpleVersionInfo{"kernel", "test"})
authConfig := &auth.AuthConfig{} authConfig := &auth.AuthConfig{}
r, err := NewRegistry("", authConfig, versionInfo...) r, err := NewRegistry("", authConfig, utils.NewHTTPRequestFactory())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -139,8 +122,11 @@ func TestPushImageJSONRegistry(t *testing.T) {
func TestPushImageLayerRegistry(t *testing.T) { func TestPushImageLayerRegistry(t *testing.T) {
r := spawnTestRegistry(t) r := spawnTestRegistry(t)
layer := strings.NewReader("FAKELAYER") layer := strings.NewReader("")
r.PushImageLayerRegistry(IMAGE_ID, layer, makeURL("/v1/"), TOKEN) _, err := r.PushImageLayerRegistry(IMAGE_ID, layer, makeURL("/v1/"), TOKEN, []byte{})
if err != nil {
t.Fatal(err)
}
} }
func TestResolveRepositoryName(t *testing.T) { func TestResolveRepositoryName(t *testing.T) {