github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Call upload status tests

Browse Source 
Fix metadata status not returning correct reference string

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2017-07-21 15:31:38 -07:00
parent bb3c9c5927
commit 8e1591bd8b
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
content/testsuite/testsuite.go
View File

@@ -20,6 +20,7 @@ import (
// ContentSuite runs a test suite on the snapshotter given a factory function.
func ContentSuite(t *testing.T, name string, storeFn func(ctx context.Context, root string) (content.Store, func(), error)) {
t.Run("Writer", makeTest(t, name, storeFn, checkContentStoreWriter))
t.Run("UploadStatus", makeTest(t, name, storeFn, checkUploadStatus))
}
func makeTest(t *testing.T, name string, storeFn func(ctx context.Context, root string) (content.Store, func(), error), fn func(ctx context.Context, t *testing.T, cs content.Store)) func(t *testing.T) {
@@ -162,12 +163,12 @@ func checkUploadStatus(ctx context.Context, t *testing.T, cs content.Store) {
// Write next 128 bytes
preUpdate = time.Now()
if _, err := w1.Write(c1[64:128]); err != nil {
if _, err := w1.Write(c1[64:192]); err != nil {
t.Fatalf("Failed to write: %+v", err)
}
postUpdate = time.Now()
expected.Offset = 192
d = digest.FromBytes(c1[64:128])
d = digest.FromBytes(c1[:192])
if err := checkStatus(w1, expected, d, preStart, postStart, preUpdate, postUpdate); err != nil {
t.Fatalf("Status check failed: %+v", err)
}
@@ -179,8 +180,7 @@ func checkUploadStatus(ctx context.Context, t *testing.T, cs content.Store) {
}
postUpdate = time.Now()
expected.Offset = 256
d = digest.FromBytes(c1[192:])
if err := checkStatus(w1, expected, d, preStart, postStart, preUpdate, postUpdate); err != nil {
if err := checkStatus(w1, expected, d1, preStart, postStart, preUpdate, postUpdate); err != nil {
t.Fatalf("Status check failed: %+v", err)
}
@@ -212,7 +212,7 @@ func checkStatus(w content.Writer, expected content.Status, d digest.Digest, pre
}
if st.Ref != expected.Ref {
return errors.Errorf("unexpected ref %v, expected %v", st.Ref, expected.Ref)
return errors.Errorf("unexpected ref %q, expected %q", st.Ref, expected.Ref)
}
if st.Offset != expected.Offset {
@@ -223,9 +223,10 @@ func checkStatus(w content.Writer, expected content.Status, d digest.Digest, pre
return errors.Errorf("unexpected total %d, expected %d", st.Total, expected.Total)
}
if st.Expected != expected.Expected {
return errors.Errorf("unexpected \"expected digest\" %v, expected %v", st.Expected, expected.Expected)
}
// TODO: Add this test once all implementations guarantee this value is held
//if st.Expected != expected.Expected {
// return errors.Errorf("unexpected \"expected digest\" %q, expected %q", st.Expected, expected.Expected)
//}
if st.StartedAt.After(postStart) || st.StartedAt.Before(preStart) {
return errors.Errorf("unexpected started at time %s, expected between %s and %s", st.StartedAt, preStart, postStart)