X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c63ff55687f32dfdff01b9827b411b3757d48ee7..61dbc4445159c9140b0744bf5526ce0f71f4f374:/services/datamanager/collection/collection_test.go

diff --git a/services/datamanager/collection/collection_test.go b/services/datamanager/collection/collection_test.go
index 4af5d4c8c4..b23ef2cf0e 100644
--- a/services/datamanager/collection/collection_test.go
+++ b/services/datamanager/collection/collection_test.go
@@ -1,8 +1,12 @@
 package collection
 
 import (
+	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	"git.curoverse.com/arvados.git/sdk/go/blockdigest"
 	. "gopkg.in/check.v1"
+	"net/http"
+	"net/http/httptest"
 	"testing"
 )
 
@@ -16,13 +20,13 @@ type MySuite struct{}
 var _ = Suite(&MySuite{})
 
 // This captures the result we expect from
-// ReadCollections.Summarize().  Because CollectionUuidToIndex is
+// ReadCollections.Summarize().  Because CollectionUUIDToIndex is
 // indeterminate, we replace BlockToCollectionIndices with
 // BlockToCollectionUuids.
 type ExpectedSummary struct {
-	OwnerToCollectionSize  map[string]int
-	BlockToReplication     map[blockdigest.DigestWithSize]int
-	BlockToCollectionUuids map[blockdigest.DigestWithSize][]string
+	OwnerToCollectionSize     map[string]int
+	BlockToDesiredReplication map[blockdigest.DigestWithSize]int
+	BlockToCollectionUuids    map[blockdigest.DigestWithSize][]string
 }
 
 func CompareSummarizedReadCollections(c *C,
@@ -32,8 +36,8 @@ func CompareSummarizedReadCollections(c *C,
 	c.Assert(summarized.OwnerToCollectionSize, DeepEquals,
 		expected.OwnerToCollectionSize)
 
-	c.Assert(summarized.BlockToReplication, DeepEquals,
-		expected.BlockToReplication)
+	c.Assert(summarized.BlockToDesiredReplication, DeepEquals,
+		expected.BlockToDesiredReplication)
 
 	summarizedBlockToCollectionUuids :=
 		make(map[blockdigest.DigestWithSize]map[string]struct{})
@@ -41,7 +45,7 @@ func CompareSummarizedReadCollections(c *C,
 		uuidSet := make(map[string]struct{})
 		summarizedBlockToCollectionUuids[digest] = uuidSet
 		for _, index := range indices {
-			uuidSet[summarized.CollectionIndexToUuid[index]] = struct{}{}
+			uuidSet[summarized.CollectionIndexToUUID[index]] = struct{}{}
 		}
 	}
 
@@ -60,22 +64,22 @@ func CompareSummarizedReadCollections(c *C,
 }
 
 func (s *MySuite) TestSummarizeSimple(checker *C) {
-	rc := MakeTestReadCollections([]TestCollectionSpec{TestCollectionSpec{
+	rc := MakeTestReadCollections([]TestCollectionSpec{{
 		ReplicationLevel: 5,
 		Blocks:           []int{1, 2},
 	}})
 
 	rc.Summarize(nil)
 
-	c := rc.UuidToCollection["col0"]
+	c := rc.UUIDToCollection["col0"]
 
 	blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
 	blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
 
 	expected := ExpectedSummary{
-		OwnerToCollectionSize:  map[string]int{c.OwnerUuid: c.TotalSize},
-		BlockToReplication:     map[blockdigest.DigestWithSize]int{blockDigest1: 5, blockDigest2: 5},
-		BlockToCollectionUuids: map[blockdigest.DigestWithSize][]string{blockDigest1: []string{c.Uuid}, blockDigest2: []string{c.Uuid}},
+		OwnerToCollectionSize:     map[string]int{c.OwnerUUID: c.TotalSize},
+		BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{blockDigest1: 5, blockDigest2: 5},
+		BlockToCollectionUuids:    map[blockdigest.DigestWithSize][]string{blockDigest1: {c.UUID}, blockDigest2: {c.UUID}},
 	}
 
 	CompareSummarizedReadCollections(checker, rc, expected)
@@ -83,11 +87,11 @@ func (s *MySuite) TestSummarizeSimple(checker *C) {
 
 func (s *MySuite) TestSummarizeOverlapping(checker *C) {
 	rc := MakeTestReadCollections([]TestCollectionSpec{
-		TestCollectionSpec{
+		{
 			ReplicationLevel: 5,
 			Blocks:           []int{1, 2},
 		},
-		TestCollectionSpec{
+		{
 			ReplicationLevel: 8,
 			Blocks:           []int{2, 3},
 		},
@@ -95,8 +99,8 @@ func (s *MySuite) TestSummarizeOverlapping(checker *C) {
 
 	rc.Summarize(nil)
 
-	c0 := rc.UuidToCollection["col0"]
-	c1 := rc.UuidToCollection["col1"]
+	c0 := rc.UUIDToCollection["col0"]
+	c1 := rc.UUIDToCollection["col1"]
 
 	blockDigest1 := blockdigest.MakeTestDigestWithSize(1)
 	blockDigest2 := blockdigest.MakeTestDigestWithSize(2)
@@ -104,20 +108,95 @@ func (s *MySuite) TestSummarizeOverlapping(checker *C) {
 
 	expected := ExpectedSummary{
 		OwnerToCollectionSize: map[string]int{
-			c0.OwnerUuid: c0.TotalSize,
-			c1.OwnerUuid: c1.TotalSize,
+			c0.OwnerUUID: c0.TotalSize,
+			c1.OwnerUUID: c1.TotalSize,
 		},
-		BlockToReplication: map[blockdigest.DigestWithSize]int{
+		BlockToDesiredReplication: map[blockdigest.DigestWithSize]int{
 			blockDigest1: 5,
 			blockDigest2: 8,
 			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},
 		},
 	}
 
 	CompareSummarizedReadCollections(checker, rc, expected)
 }
+
+type APITestData struct {
+	// path and response map
+	responses map[string]arvadostest.StubResponse
+
+	// expected error, if any
+	expectedError string
+}
+
+func (s *MySuite) TestGetCollectionsAndSummarize_DiscoveryError(c *C) {
+	testGetCollectionsAndSummarize(c,
+		APITestData{
+			responses:     make(map[string]arvadostest.StubResponse),
+			expectedError: "arvados API server error: 500.*",
+		})
+}
+
+func (s *MySuite) TestGetCollectionsAndSummarize_ApiErrorGetCollections(c *C) {
+	respMap := make(map[string]arvadostest.StubResponse)
+	respMap["/discovery/v1/apis/arvados/v1/rest"] = arvadostest.StubResponse{200, `{"defaultCollectionReplication":2}`}
+	respMap["/arvados/v1/collections"] = arvadostest.StubResponse{-1, ``}
+
+	testGetCollectionsAndSummarize(c,
+		APITestData{
+			responses:     respMap,
+			expectedError: "arvados API server error: 302.*",
+		})
+}
+
+func (s *MySuite) TestGetCollectionsAndSummarize_GetCollectionsBadStreamName(c *C) {
+	respMap := make(map[string]arvadostest.StubResponse)
+	respMap["/discovery/v1/apis/arvados/v1/rest"] = arvadostest.StubResponse{200, `{"defaultCollectionReplication":2}`}
+	respMap["/arvados/v1/collections"] = arvadostest.StubResponse{200, `{"items_available":1,"items":[{"modified_at":"2015-11-24T15:04:05Z","manifest_text":"badstreamname"}]}`}
+
+	testGetCollectionsAndSummarize(c,
+		APITestData{
+			responses:     respMap,
+			expectedError: "Invalid stream name: badstreamname",
+		})
+}
+
+func (s *MySuite) TestGetCollectionsAndSummarize_GetCollectionsBadFileToken(c *C) {
+	respMap := make(map[string]arvadostest.StubResponse)
+	respMap["/discovery/v1/apis/arvados/v1/rest"] = arvadostest.StubResponse{200, `{"defaultCollectionReplication":2}`}
+	respMap["/arvados/v1/collections"] = arvadostest.StubResponse{200, `{"items_available":1,"items":[{"modified_at":"2015-11-24T15:04:05Z","manifest_text":"./goodstream acbd18db4cc2f85cedef654fccc4a4d8+3 0:1:file1.txt file2.txt"}]}`}
+
+	testGetCollectionsAndSummarize(c,
+		APITestData{
+			responses:     respMap,
+			expectedError: "Invalid file token: file2.txt",
+		})
+}
+
+func testGetCollectionsAndSummarize(c *C, testData APITestData) {
+	apiStub := arvadostest.ServerStub{testData.responses}
+
+	api := httptest.NewServer(&apiStub)
+	defer api.Close()
+
+	arv := arvadosclient.ArvadosClient{
+		Scheme:    "http",
+		ApiServer: api.URL[7:],
+		ApiToken:  "abc123",
+		Client:    &http.Client{Transport: &http.Transport{}},
+	}
+
+	// GetCollectionsAndSummarize
+	_, err := GetCollectionsAndSummarize(GetCollectionsParams{arv, nil, 10})
+
+	if testData.expectedError == "" {
+		c.Assert(err, IsNil)
+	} else {
+		c.Assert(err, ErrorMatches, testData.expectedError)
+	}
+}