projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6260: so many golint complaints!!
[arvados.git]
/
services
/
datamanager
/
collection
/
collection_test.go
diff --git
a/services/datamanager/collection/collection_test.go
b/services/datamanager/collection/collection_test.go
index 1669bb778498a1b912c8cd68ebc36042e14405d4..07c82e1abc0b5581c523683b4947e7d094f7c9cd 100644
(file)
--- a/
services/datamanager/collection/collection_test.go
+++ b/
services/datamanager/collection/collection_test.go
@@
-16,7
+16,7
@@
type MySuite struct{}
var _ = Suite(&MySuite{})
// This captures the result we expect from
var _ = Suite(&MySuite{})
// This captures the result we expect from
-// ReadCollections.Summarize(). Because CollectionU
uid
ToIndex is
+// ReadCollections.Summarize(). Because CollectionU
UID
ToIndex is
// indeterminate, we replace BlockToCollectionIndices with
// BlockToCollectionUuids.
type ExpectedSummary struct {
// indeterminate, we replace BlockToCollectionIndices with
// BlockToCollectionUuids.
type ExpectedSummary struct {
@@
-41,7
+41,7
@@
func CompareSummarizedReadCollections(c *C,
uuidSet := make(map[string]struct{})
summarizedBlockToCollectionUuids[digest] = uuidSet
for _, index := range indices {
uuidSet := make(map[string]struct{})
summarizedBlockToCollectionUuids[digest] = uuidSet
for _, index := range indices {
- uuidSet[summarized.CollectionIndexToU
uid
[index]] = struct{}{}
+ uuidSet[summarized.CollectionIndexToU
UID
[index]] = struct{}{}
}
}
}
}
@@
-67,15
+67,15
@@
func (s *MySuite) TestSummarizeSimple(checker *C) {
rc.Summarize(nil)
rc.Summarize(nil)
- c := rc.U
uid
ToCollection["col0"]
+ c := rc.U
UID
ToCollection["col0"]
blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
expected := ExpectedSummary{
blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
expected := ExpectedSummary{
- OwnerToCollectionSize: map[string]int{c.OwnerU
uid
: c.TotalSize},
+ OwnerToCollectionSize: map[string]int{c.OwnerU
UID
: c.TotalSize},
BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{blockDigest1: 5, blockDigest2: 5},
BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{blockDigest1: 5, blockDigest2: 5},
- BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{blockDigest1: []string{c.U
uid}, blockDigest2: []string{c.Uuid
}},
+ BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{blockDigest1: []string{c.U
UID}, blockDigest2: []string{c.UUID
}},
}
CompareSummarizedReadCollections(checker, rc, expected)
}
CompareSummarizedReadCollections(checker, rc, expected)
@@
-95,8
+95,8
@@
func (s *MySuite) TestSummarizeOverlapping(checker *C) {
rc.Summarize(nil)
rc.Summarize(nil)
- c0 := rc.U
uid
ToCollection["col0"]
- c1 := rc.U
uid
ToCollection["col1"]
+ c0 := rc.U
UID
ToCollection["col0"]
+ c1 := rc.U
UID
ToCollection["col1"]
blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
@@
-104,8
+104,8
@@
func (s *MySuite) TestSummarizeOverlapping(checker *C) {
expected := ExpectedSummary{
OwnerToCollectionSize: map[string]int{
expected := ExpectedSummary{
OwnerToCollectionSize: map[string]int{
- c0.OwnerU
uid
: c0.TotalSize,
- c1.OwnerU
uid
: c1.TotalSize,
+ c0.OwnerU
UID
: c0.TotalSize,
+ c1.OwnerU
UID
: c1.TotalSize,
},
BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{
blockDigest1: 5,
},
BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{
blockDigest1: 5,
@@
-113,9
+113,9
@@
func (s *MySuite) TestSummarizeOverlapping(checker *C) {
blockDigest3: 8,
},
BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{
blockDigest3: 8,
},
BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{
- blockDigest1: []string{c0.U
uid
},
- blockDigest2: []string{c0.U
uid, c1.Uuid
},
- blockDigest3: []string{c1.U
uid
},
+ blockDigest1: []string{c0.U
UID
},
+ blockDigest2: []string{c0.U
UID, c1.UUID
},
+ blockDigest3: []string{c1.U
UID
},
},
}
},
}