projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8784: Fix test for latest firefox.
[arvados.git]
/
services
/
crunch-run
/
crunchrun_test.go
diff --git
a/services/crunch-run/crunchrun_test.go
b/services/crunch-run/crunchrun_test.go
index 8cefbedf19200f165eb7d607dec93bbad330b6f5..1577215afa745b5f9d50311cd5828ab15f592b09 100644
(file)
--- 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/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"
"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
type FileWrapper struct {
io.ReadCloser
- len
u
int64
+ len int64
}
}
-func (fw FileWrapper)
Len() u
int64 {
+func (fw FileWrapper)
Size()
int64 {
return fw.len
}
return fw.len
}
@@
-316,7
+315,7
@@
func (fw FileWrapper) Seek(int64, int) (int64, error) {
return 0, errors.New("not implemented")
}
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
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")
}
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")
}
return nil, errors.New("KeepError")
}
@@
-424,7
+423,7
@@
func (ErrorReader) Close() error {
return nil
}
return nil
}
-func (ErrorReader)
Len() u
int64 {
+func (ErrorReader)
Size()
int64 {
return 0
}
return 0
}
@@
-432,7
+431,7
@@
func (ErrorReader) Seek(int64, int) (int64, error) {
return 0, errors.New("ErrorReader")
}
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
}
return ErrorReader{}, nil
}