vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing up tests to work with for non-tarsum future

Browse source 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence 2015-03-04 20:26:56 -08:00
parent 98daae176a
commit 2a786bfc23
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/storage/layer_test.go
View file

@ -266,12 +266,12 @@ func TestLayerUploadZeroLength(t *testing.T) {
io.Copy(upload, bytes.NewReader([]byte{}))
dgst, err := digest.FromTarArchive(bytes.NewReader([]byte{}))
dgst, err := digest.FromReader(bytes.NewReader([]byte{}))
if err != nil {
t.Fatalf("error getting zero digest: %v", err)
}
if dgst != digest.DigestTarSumV1EmptyTar {
if dgst != digest.DigestSha256EmptyTar {
// sanity check on zero digest
t.Fatalf("digest not as expected: %v != %v", dgst, digest.DigestTarSumV1EmptyTar)
}

2
docs/storage/layerupload.go
View file

@ -159,7 +159,7 @@ func (luc *layerUploadController) moveLayer(dgst digest.Digest) error {
// a zero-length blob into a nonzero-length blob location. To
// prevent this horrid thing, we employ the hack of only allowing
// to this happen for the zero tarsum.
if dgst == digest.DigestTarSumV1EmptyTar {
if dgst == digest.DigestSha256EmptyTar {
return luc.driver.PutContent(blobPath, []byte{})
}