X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8fd18fc4a32797fc3c6255099fc253d7aede12b5..3f5c2b95de8483e277a472846ad7e5b2ccb1f79a:/services/crunch-run/crunchrun_test.go

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index f124359fd6..3062fc0194 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -103,6 +103,10 @@ func (m *MockConn) Write(b []byte) (int, error) {
 	return len(b), nil
 }
 
+func (m *MockConn) Close() error {
+	return nil
+}
+
 func NewMockConn() *MockConn {
 	c := &MockConn{}
 	return c
@@ -300,12 +304,7 @@ func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename s
 		rdr := ioutil.NopCloser(&bytes.Buffer{})
 		client.Called = true
 		return FileWrapper{rdr, 1321984}, nil
-	}
-	return nil, nil
-}
-
-func (client *KeepTestClient) CollectionFileReader(collection map[string]interface{}, filename string) (keepclient.Reader, error) {
-	if filename == "/file1_in_main.txt" {
+	} else if filename == "/file1_in_main.txt" {
 		rdr := ioutil.NopCloser(strings.NewReader("foo"))
 		client.Called = true
 		return FileWrapper{rdr, 3}, nil
@@ -392,10 +391,6 @@ func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename stri
 	return nil, errors.New("KeepError")
 }
 
-func (KeepErrorTestClient) CollectionFileReader(c map[string]interface{}, f string) (keepclient.Reader, error) {
-	return nil, errors.New("KeepError")
-}
-
 type KeepReadErrorTestClient struct{}
 
 func (KeepReadErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) {
@@ -424,10 +419,6 @@ func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename
 	return ErrorReader{}, nil
 }
 
-func (KeepReadErrorTestClient) CollectionFileReader(c map[string]interface{}, f string) (keepclient.Reader, error) {
-	return ErrorReader{}, nil
-}
-
 func (s *TestSuite) TestLoadImageArvError(c *C) {
 	// (1) Arvados error
 	cr := NewContainerRunner(ArvErrorTestClient{}, &KeepTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz")