Merge branch 'master' into 6260-test-datamanager
[arvados.git] / services / datamanager / summary / trash_list_test.go
index b6f9582e7403f8110e64e67f0e3de2d2a8d591ed..7620631a157688adbf06f4db90e10edebb7fb4b5 100644 (file)
@@ -8,7 +8,7 @@ import (
 )
 
 // Gocheck boilerplate
-func TrashTest(t *testing.T) {
+func TestTrash(t *testing.T) {
        TestingT(t)
 }
 
@@ -38,7 +38,7 @@ func (s *TrashSuite) TestBuildTrashLists(c *C) {
        bs[block0] = struct{}{}
 
        // Test trash list where only sv0 is on writable list.
-       c.Check(BuildTrashListsInternal(
+       c.Check(buildTrashListsInternal(
                map[string]struct{}{
                        sv0.URL(): struct{}{}},
                &keepServerInfo,
@@ -49,7 +49,7 @@ func (s *TrashSuite) TestBuildTrashLists(c *C) {
                        "http://keep0.example.com:80": keep.TrashList{keep.TrashRequest{"000000000000000000000000deadbeef", 99}}})
 
        // Test trash list where both sv0 and sv1 are on writable list.
-       c.Check(BuildTrashListsInternal(
+       c.Check(buildTrashListsInternal(
                map[string]struct{}{
                        sv0.URL(): struct{}{},
                        sv1.URL(): struct{}{}},
@@ -62,7 +62,7 @@ func (s *TrashSuite) TestBuildTrashLists(c *C) {
                        "http://keep1.example.com:80": keep.TrashList{keep.TrashRequest{"000000000000000000000000deadbeef", 101}}})
 
        // Test trash list where only block on sv0 is expired
-       c.Check(BuildTrashListsInternal(
+       c.Check(buildTrashListsInternal(
                map[string]struct{}{
                        sv0.URL(): struct{}{},
                        sv1.URL(): struct{}{}},