16159: Merge branch 'master' into 16159-token-expiration-on-logout

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

diff --git a/services/keepstore/collision_test.go b/services/keepstore/collision_test.go
index e6cfd168b93190dbbdb5e42b5168864a15ae38b0..0d6fd62833b296d2650e8b8d6829ca95179b995b 100644 (file)
--- a/services/keepstore/collision_test.go
+++ b/services/keepstore/collision_test.go
@@ -1,18 +1,16 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
        "bytes"
-       "testing"
        "testing/iotest"
 
        check "gopkg.in/check.v1"
 )
 
-// Gocheck boilerplate
-func Test(t *testing.T) {
-       check.TestingT(t)
-}
-
 var _ = check.Suite(&CollisionSuite{})
 
 type CollisionSuite struct{}
@@ -39,6 +37,14 @@ func (s *CollisionSuite) TestCollisionOrCorrupt(c *check.C) {
                check.Equals, DiskHashError)
        c.Check(collisionOrCorrupt(fooMD5, []byte{}, nil, bytes.NewBufferString("")),
                check.Equals, DiskHashError)
+       c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'O'}, nil, bytes.NewBufferString("o")),
+               check.Equals, DiskHashError)
+       c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'O', 'o'}, nil, nil),
+               check.Equals, DiskHashError)
+       c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'o'}, []byte{'O'}, nil),
+               check.Equals, DiskHashError)
+       c.Check(collisionOrCorrupt(fooMD5, []byte{'f', 'o'}, nil, bytes.NewBufferString("O")),
+               check.Equals, DiskHashError)
 
        c.Check(collisionOrCorrupt(fooMD5, []byte{}, nil, iotest.TimeoutReader(iotest.OneByteReader(bytes.NewBufferString("foo")))),
                check.Equals, iotest.ErrTimeout)