projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20242-dup-trash-lists'
[arvados.git]
/
services
/
keepproxy
/
keepproxy_test.go
diff --git
a/services/keepproxy/keepproxy_test.go
b/services/keepproxy/keepproxy_test.go
index 8242f5b2b56868b23dfaecf4aefe814100e682ee..8c4a649f69d64d4872fb11efb7083403d87094da 100644
(file)
--- a/
services/keepproxy/keepproxy_test.go
+++ b/
services/keepproxy/keepproxy_test.go
@@
-146,7
+146,6
@@
func runProxy(c *C, bogusClientToken bool, loadKeepstoresFromConfig bool, kp *ar
TestProxyUUID: "http://" + srv.Addr,
}
kc.SetServiceRoots(sr, sr, sr)
TestProxyUUID: "http://" + srv.Addr,
}
kc.SetServiceRoots(sr, sr, sr)
- kc.Arvados.External = true
return srv, kc, logbuf
}
return srv, kc, logbuf
}
@@
-696,7
+695,7
@@
func (s *ServerRequiredSuite) TestCollectionSharingToken(c *C) {
defer srv.Close()
hash, _, err := kc.PutB([]byte("shareddata"))
c.Check(err, IsNil)
defer srv.Close()
hash, _, err := kc.PutB([]byte("shareddata"))
c.Check(err, IsNil)
- kc.Arvados.ApiToken = arvadostest.FooCollectionSharingToken
+ kc.Arvados.ApiToken = arvadostest.Foo
File
CollectionSharingToken
rdr, _, _, err := kc.Get(hash)
c.Assert(err, IsNil)
data, err := ioutil.ReadAll(rdr)
rdr, _, _, err := kc.Get(hash)
c.Assert(err, IsNil)
data, err := ioutil.ReadAll(rdr)