projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3145: Add -readonly flag. Accept multiple -volume arguments.
[arvados.git]
/
services
/
keepproxy
/
keepproxy_test.go
diff --git
a/services/keepproxy/keepproxy_test.go
b/services/keepproxy/keepproxy_test.go
index e3b4e36b63de23dee806a35a9c9d55958cbc3afd..5f6e2b9bc8eda0ef2d958071301e949a277b57c0 100644
(file)
--- a/
services/keepproxy/keepproxy_test.go
+++ b/
services/keepproxy/keepproxy_test.go
@@
-117,10
+117,10
@@
func runProxy(c *C, args []string, port int, bogusClientToken bool) keepclient.K
}
kc.SetServiceRoots(map[string]string{
"proxy": fmt.Sprintf("http://localhost:%v", port),
}
kc.SetServiceRoots(map[string]string{
"proxy": fmt.Sprintf("http://localhost:%v", port),
- })
+ }
, nil
)
c.Check(kc.Using_proxy, Equals, true)
c.Check(kc.Using_proxy, Equals, true)
- c.Check(len(kc.
Service
Roots()), Equals, 1)
- for _, root := range kc.
Service
Roots() {
+ c.Check(len(kc.
Local
Roots()), Equals, 1)
+ for _, root := range kc.
Local
Roots() {
c.Check(root, Equals, fmt.Sprintf("http://localhost:%v", port))
}
log.Print("keepclient created")
c.Check(root, Equals, fmt.Sprintf("http://localhost:%v", port))
}
log.Print("keepclient created")
@@
-154,8
+154,8
@@
func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
c.Assert(err, Equals, nil)
c.Check(kc.Arvados.External, Equals, true)
c.Check(kc.Using_proxy, Equals, true)
c.Assert(err, Equals, nil)
c.Check(kc.Arvados.External, Equals, true)
c.Check(kc.Using_proxy, Equals, true)
- c.Check(len(kc.
Service
Roots()), Equals, 1)
- for _, root := range kc.
Service
Roots() {
+ c.Check(len(kc.
Local
Roots()), Equals, 1)
+ for _, root := range kc.
Local
Roots() {
c.Check(root, Equals, "http://localhost:29950")
}
os.Setenv("ARVADOS_EXTERNAL_CLIENT", "")
c.Check(root, Equals, "http://localhost:29950")
}
os.Setenv("ARVADOS_EXTERNAL_CLIENT", "")