[ARVADOS] updated: e7dc406d4babf0fae50837c7f0040dc485242e36

[Git user]

Summary of changes:
 services/crunch-run/crunchrun_test.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

       via  e7dc406d4babf0fae50837c7f0040dc485242e36 (commit)
      from  e2cd53d9007d56e1de4816f6aeab4bd769271162 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e7dc406d4babf0fae50837c7f0040dc485242e36
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jun 19 18:37:13 2017 -0400

    8784: Replace remaining uses of keepclient.Reader with arvados.File.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 8cefbed..1577215 100644
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -24,7 +24,6 @@ import (
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 	"git.curoverse.com/arvados.git/sdk/go/manifest"
 
 	dockertypes "github.com/docker/docker/api/types"
@@ -305,10 +304,10 @@ func (client *KeepTestClient) PutHB(hash string, buf []byte) (string, int, error
 
 type FileWrapper struct {
 	io.ReadCloser
-	len uint64
+	len int64
 }
 
-func (fw FileWrapper) Len() uint64 {
+func (fw FileWrapper) Size() int64 {
 	return fw.len
 }
 
@@ -316,7 +315,7 @@ func (fw FileWrapper) Seek(int64, int) (int64, error) {
 	return 0, errors.New("not implemented")
 }
 
-func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.Reader, error) {
+func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (arvados.File, error) {
 	if filename == hwImageId+".tar" {
 		rdr := ioutil.NopCloser(&bytes.Buffer{})
 		client.Called = true
@@ -404,7 +403,7 @@ func (KeepErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) {
 	return "", 0, errors.New("KeepError")
 }
 
-func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.Reader, error) {
+func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (arvados.File, error) {
 	return nil, errors.New("KeepError")
 }
 
@@ -424,7 +423,7 @@ func (ErrorReader) Close() error {
 	return nil
 }
 
-func (ErrorReader) Len() uint64 {
+func (ErrorReader) Size() int64 {
 	return 0
 }
 
@@ -432,7 +431,7 @@ func (ErrorReader) Seek(int64, int) (int64, error) {
 	return 0, errors.New("ErrorReader")
 }
 
-func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.Reader, error) {
+func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (arvados.File, error) {
 	return ErrorReader{}, nil
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--