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

Merge pull request #783 from stevvooe/next-generation 

Correct references after move of Manifest into storage package
master
Olivier Gambier 2014-11-24 17:32:12 -08:00
parent d825559473 66d2a13aec
commit 756989c011
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/client_test.go
View File

@ -258,21 +258,23 @@ func TestPullResume(t *testing.T) {
contents: []byte("some other contents"), contents: []byte("some other contents"),
}, },
} }
layers := make([]registry.FSLayer, len(testBlobs)) layers := make([]storage.FSLayer, len(testBlobs))
history := make([]registry.ManifestHistory, len(testBlobs)) history := make([]storage.ManifestHistory, len(testBlobs))
for i, layer := range testBlobs { for i, layer := range testBlobs {
layers[i] = registry.FSLayer{BlobSum: layer.digest} layers[i] = storage.FSLayer{BlobSum: layer.digest}
history[i] = registry.ManifestHistory{V1Compatibility: layer.digest.String()} history[i] = storage.ManifestHistory{V1Compatibility: layer.digest.String()}
} }
manifest := &registry.ImageManifest{ manifest := &storage.Manifest{
Name: name, Name: name,
Tag: tag, Tag: tag,
Architecture: "x86", Architecture: "x86",
FSLayers: layers, FSLayers: layers,
History: history, History: history,
SchemaVersion: 1, Versioned: storage.Versioned{
SchemaVersion: 1,
},
} }
manifestBytes, err := json.Marshal(manifest) manifestBytes, err := json.Marshal(manifest)
@ -323,7 +325,7 @@ func TestPullResume(t *testing.T) {
client := New(server.URL) client := New(server.URL)
objectStore := &memoryObjectStore{ objectStore := &memoryObjectStore{
mutex: new(sync.Mutex), mutex: new(sync.Mutex),
manifestStorage: make(map[string]*registry.ImageManifest), manifestStorage: make(map[string]*storage.SignedManifest),
layerStorage: make(map[digest.Digest]Layer), layerStorage: make(map[digest.Digest]Layer),
} }