9956: Remove obsolete TODO comment.

[arvados.git] / services / keepstore / keepstore_test.go

diff --git a/services/keepstore/keepstore_test.go b/services/keepstore/keepstore_test.go
index 9b132927c6a773a1d396e53da813e306698b5242..dc6af0fa0d651c79cd6694a006fd3ad83ba2d677 100644 (file)
--- a/services/keepstore/keepstore_test.go
+++ b/services/keepstore/keepstore_test.go
@@ -10,6 +10,8 @@ import (
        "sort"
        "strings"
        "testing"
+
+       "git.curoverse.com/arvados.git/sdk/go/arvadostest"
 )
 
 var TestBlock = []byte("The quick brown fox jumps over the lazy dog.")
@@ -64,12 +66,13 @@ func TestGetBlock(t *testing.T) {
        }
 
        // Check that GetBlock returns success.
-       result, err := GetBlock(TestHash)
+       buf := make([]byte, BlockSize)
+       size, err := GetBlock(TestHash, buf, nil)
        if err != nil {
                t.Errorf("GetBlock error: %s", err)
        }
-       if fmt.Sprint(result) != fmt.Sprint(TestBlock) {
-               t.Errorf("expected %s, got %s", TestBlock, result)
+       if bytes.Compare(buf[:size], TestBlock) != 0 {
+               t.Errorf("got %v, expected %v", buf[:size], TestBlock)
        }
 }
 
@@ -84,9 +87,10 @@ func TestGetBlockMissing(t *testing.T) {
        defer KeepVM.Close()
 
        // Check that GetBlock returns failure.
-       result, err := GetBlock(TestHash)
+       buf := make([]byte, BlockSize)
+       size, err := GetBlock(TestHash, buf, nil)
        if err != NotFoundError {
-               t.Errorf("Expected NotFoundError, got %v", result)
+               t.Errorf("Expected NotFoundError, got %v, err %v", buf[:size], err)
        }
 }
 
@@ -105,9 +109,10 @@ func TestGetBlockCorrupt(t *testing.T) {
        vols[0].Put(TestHash, BadBlock)
 
        // Check that GetBlock returns failure.
-       result, err := GetBlock(TestHash)
+       buf := make([]byte, BlockSize)
+       size, err := GetBlock(TestHash, buf, nil)
        if err != DiskHashError {
-               t.Errorf("Expected DiskHashError, got %v (buf: %v)", err, result)
+               t.Errorf("Expected DiskHashError, got %v (buf: %v)", err, buf[:size])
        }
 }
 
@@ -131,13 +136,14 @@ func TestPutBlockOK(t *testing.T) {
        }
 
        vols := KeepVM.AllReadable()
-       result, err := vols[1].Get(TestHash)
+       buf := make([]byte, BlockSize)
+       n, err := vols[1].Get(TestHash, buf)
        if err != nil {
                t.Fatalf("Volume #0 Get returned error: %v", err)
        }
-       if string(result) != string(TestBlock) {
+       if string(buf[:n]) != string(TestBlock) {
                t.Fatalf("PutBlock stored '%s', Get retrieved '%s'",
-                       string(TestBlock), string(result))
+                       string(TestBlock), string(buf[:n]))
        }
 }
 
@@ -160,14 +166,14 @@ func TestPutBlockOneVol(t *testing.T) {
                t.Fatalf("PutBlock: n %d err %v", n, err)
        }
 
-       result, err := GetBlock(TestHash)
+       buf := make([]byte, BlockSize)
+       size, err := GetBlock(TestHash, buf, nil)
        if err != nil {
                t.Fatalf("GetBlock: %v", err)
        }
-       if string(result) != string(TestBlock) {
-               t.Error("PutBlock/GetBlock mismatch")
-               t.Fatalf("PutBlock stored '%s', GetBlock retrieved '%s'",
-                       string(TestBlock), string(result))
+       if bytes.Compare(buf[:size], TestBlock) != 0 {
+               t.Fatalf("PutBlock stored %+q, GetBlock retrieved %+q",
+                       TestBlock, buf[:size])
        }
 }
 
@@ -185,11 +191,11 @@ func TestPutBlockMD5Fail(t *testing.T) {
        // Check that PutBlock returns the expected error when the hash does
        // not match the block.
        if _, err := PutBlock(BadBlock, TestHash); err != RequestHashError {
-               t.Error("Expected RequestHashError, got %v", err)
+               t.Errorf("Expected RequestHashError, got %v", err)
        }
 
        // Confirm that GetBlock fails to return anything.
-       if result, err := GetBlock(TestHash); err != NotFoundError {
+       if result, err := GetBlock(TestHash, make([]byte, BlockSize), nil); err != NotFoundError {
                t.Errorf("GetBlock succeeded after a corrupt block store (result = %s, err = %v)",
                        string(result), err)
        }
@@ -214,10 +220,11 @@ func TestPutBlockCorrupt(t *testing.T) {
        }
 
        // The block on disk should now match TestBlock.
-       if block, err := GetBlock(TestHash); err != nil {
+       buf := make([]byte, BlockSize)
+       if size, err := GetBlock(TestHash, buf, nil); err != nil {
                t.Errorf("GetBlock: %v", err)
-       } else if bytes.Compare(block, TestBlock) != 0 {
-               t.Errorf("GetBlock returned: '%s'", string(block))
+       } else if bytes.Compare(buf[:size], TestBlock) != 0 {
+               t.Errorf("Got %+q, expected %+q", buf[:size], TestBlock)
        }
 }
 
@@ -229,9 +236,9 @@ func TestPutBlockCollision(t *testing.T) {
        defer teardown()
 
        // These blocks both hash to the MD5 digest cee9a457e790cf20d4bdaa6d69f01e41.
-       var b1 = []byte("\x0e0eaU\x9a\xa7\x87\xd0\x0b\xc6\xf7\x0b\xbd\xfe4\x04\xcf\x03e\x9epO\x854\xc0\x0f\xfbe\x9cL\x87@\xcc\x94/\xeb-\xa1\x15\xa3\xf4\x15\\\xbb\x86\x07Is\x86em}\x1f4\xa4 Y\xd7\x8fZ\x8d\xd1\xef")
-       var b2 = []byte("\x0e0eaU\x9a\xa7\x87\xd0\x0b\xc6\xf7\x0b\xbd\xfe4\x04\xcf\x03e\x9etO\x854\xc0\x0f\xfbe\x9cL\x87@\xcc\x94/\xeb-\xa1\x15\xa3\xf4\x15\xdc\xbb\x86\x07Is\x86em}\x1f4\xa4 Y\xd7\x8fZ\x8d\xd1\xef")
-       var locator = "cee9a457e790cf20d4bdaa6d69f01e41"
+       b1 := arvadostest.MD5CollisionData[0]
+       b2 := arvadostest.MD5CollisionData[1]
+       locator := arvadostest.MD5CollisionMD5
 
        // Prepare two test Keep volumes.
        KeepVM = MakeTestVolumeManager(2)
@@ -288,12 +295,13 @@ func TestPutBlockTouchFails(t *testing.T) {
                t.Errorf("mtime was changed on vols[0]:\noldMtime = %v\nnewMtime = %v\n",
                        oldMtime, newMtime)
        }
-       result, err := vols[1].Get(TestHash)
+       buf := make([]byte, BlockSize)
+       n, err := vols[1].Get(TestHash, buf)
        if err != nil {
                t.Fatalf("vols[1]: %v", err)
        }
-       if bytes.Compare(result, TestBlock) != 0 {
-               t.Errorf("new block does not match test block\nnew block = %v\n", result)
+       if bytes.Compare(buf[:n], TestBlock) != 0 {
+               t.Errorf("new block does not match test block\nnew block = %v\n", buf[:n])
        }
 }
 
@@ -333,23 +341,23 @@ func TestDiscoverTmpfs(t *testing.T) {
        f.Close()
        ProcMounts = f.Name()
 
-       resultVols := volumeSet{}
-       added := (&unixVolumeAdder{&resultVols}).Discover()
+       cfg := &Config{}
+       added := (&unixVolumeAdder{cfg}).Discover()
 
-       if added != len(resultVols) {
+       if added != len(cfg.Volumes) {
                t.Errorf("Discover returned %d, but added %d volumes",
-                       added, len(resultVols))
+                       added, len(cfg.Volumes))
        }
        if added != len(tempVols) {
                t.Errorf("Discover returned %d but we set up %d volumes",
                        added, len(tempVols))
        }
        for i, tmpdir := range tempVols {
-               if tmpdir != resultVols[i].(*UnixVolume).root {
+               if tmpdir != cfg.Volumes[i].(*UnixVolume).Root {
                        t.Errorf("Discover returned %s, expected %s\n",
-                               resultVols[i].(*UnixVolume).root, tmpdir)
+                               cfg.Volumes[i].(*UnixVolume).Root, tmpdir)
                }
-               if expectReadonly := i%2 == 1; expectReadonly != resultVols[i].(*UnixVolume).readonly {
+               if expectReadonly := i%2 == 1; expectReadonly != cfg.Volumes[i].(*UnixVolume).ReadOnly {
                        t.Errorf("Discover added %s with readonly=%v, should be %v",
                                tmpdir, !expectReadonly, expectReadonly)
                }
@@ -373,10 +381,10 @@ func TestDiscoverNone(t *testing.T) {
        f.Close()
        ProcMounts = f.Name()
 
-       resultVols := volumeSet{}
-       added := (&unixVolumeAdder{&resultVols}).Discover()
-       if added != 0 || len(resultVols) != 0 {
-               t.Fatalf("got %d, %v; expected 0, []", added, resultVols)
+       cfg := &Config{}
+       added := (&unixVolumeAdder{cfg}).Discover()
+       if added != 0 || len(cfg.Volumes) != 0 {
+               t.Fatalf("got %d, %v; expected 0, []", added, cfg.Volumes)
        }
 }
 
@@ -434,8 +442,8 @@ func MakeTestVolumeManager(numVolumes int) VolumeManager {
 
 // teardown cleans up after each test.
 func teardown() {
-       dataManagerToken = ""
-       enforcePermissions = false
-       PermissionSecret = nil
+       theConfig.systemAuthToken = ""
+       theConfig.RequireSignatures = false
+       theConfig.blobSigningKey = nil
        KeepVM = nil
 }