projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9486-retry-instance-limit-exceeded' closes #9486
[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 22cf54f639e9d71067eaec07c4a870bafa4d03b3..b23ef2cf0e4d658677e34847b73be12872653b21 100644
(file)
--- a/
services/datamanager/collection/collection_test.go
+++ b/
services/datamanager/collection/collection_test.go
@@
-64,7
+64,7
@@
func CompareSummarizedReadCollections(c *C,
}
func (s *MySuite) TestSummarizeSimple(checker *C) {
}
func (s *MySuite) TestSummarizeSimple(checker *C) {
- rc := MakeTestReadCollections([]TestCollectionSpec{
TestCollectionSpec
{
+ rc := MakeTestReadCollections([]TestCollectionSpec{{
ReplicationLevel: 5,
Blocks: []int{1, 2},
}})
ReplicationLevel: 5,
Blocks: []int{1, 2},
}})
@@
-79,7
+79,7
@@
func (s *MySuite) TestSummarizeSimple(checker *C) {
expected := ExpectedSummary{
OwnerToCollectionSize: map[string]int{c.OwnerUUID: c.TotalSize},
BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{blockDigest1: 5, blockDigest2: 5},
expected := ExpectedSummary{
OwnerToCollectionSize: map[string]int{c.OwnerUUID: c.TotalSize},
BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{blockDigest1: 5, blockDigest2: 5},
- BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{blockDigest1:
[]string{c.UUID}, blockDigest2: []string
{c.UUID}},
+ BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{blockDigest1:
{c.UUID}, blockDigest2:
{c.UUID}},
}
CompareSummarizedReadCollections(checker, rc, expected)
}
CompareSummarizedReadCollections(checker, rc, expected)
@@
-87,11
+87,11
@@
func (s *MySuite) TestSummarizeSimple(checker *C) {
func (s *MySuite) TestSummarizeOverlapping(checker *C) {
rc := MakeTestReadCollections([]TestCollectionSpec{
func (s *MySuite) TestSummarizeOverlapping(checker *C) {
rc := MakeTestReadCollections([]TestCollectionSpec{
-
TestCollectionSpec
{
+ {
ReplicationLevel: 5,
Blocks: []int{1, 2},
},
ReplicationLevel: 5,
Blocks: []int{1, 2},
},
-
TestCollectionSpec
{
+ {
ReplicationLevel: 8,
Blocks: []int{2, 3},
},
ReplicationLevel: 8,
Blocks: []int{2, 3},
},
@@
-117,9
+117,9
@@
func (s *MySuite) TestSummarizeOverlapping(checker *C) {
blockDigest3: 8,
},
BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{
blockDigest3: 8,
},
BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{
- blockDigest1:
[]string
{c0.UUID},
- blockDigest2:
[]string
{c0.UUID, c1.UUID},
- blockDigest3:
[]string
{c1.UUID},
+ blockDigest1: {c0.UUID},
+ blockDigest2: {c0.UUID, c1.UUID},
+ blockDigest3: {c1.UUID},
},
}
},
}
@@
-192,11
+192,11
@@
func testGetCollectionsAndSummarize(c *C, testData APITestData) {
}
// GetCollectionsAndSummarize
}
// GetCollectionsAndSummarize
-
results
:= GetCollectionsAndSummarize(GetCollectionsParams{arv, nil, 10})
+
_, err
:= GetCollectionsAndSummarize(GetCollectionsParams{arv, nil, 10})
if testData.expectedError == "" {
if testData.expectedError == "" {
- c.Assert(
results.E
rr, IsNil)
+ c.Assert(
e
rr, IsNil)
} else {
} else {
- c.Assert(
results.E
rr, ErrorMatches, testData.expectedError)
+ c.Assert(
e
rr, ErrorMatches, testData.expectedError)
}
}
}
}