projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15305-keep-balance-bytes'
[arvados.git]
/
lib
/
controller
/
router
/
router_test.go
diff --git
a/lib/controller/router/router_test.go
b/lib/controller/router/router_test.go
index 4e6b1617330ffa47c405d2c9e708ee69e979e641..3a7045aa4de2681f53af5645d7008d290b035321 100644
(file)
--- a/
lib/controller/router/router_test.go
+++ b/
lib/controller/router/router_test.go
@@
-10,11
+10,13
@@
import (
"io"
"net/http"
"net/http/httptest"
"io"
"net/http"
"net/http/httptest"
+ "net/url"
"os"
"strings"
"testing"
"time"
"os"
"strings"
"testing"
"time"
+ "git.curoverse.com/arvados.git/lib/controller/rpc"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"github.com/julienschmidt/httprouter"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"github.com/julienschmidt/httprouter"
@@
-158,7
+160,8
@@
func (s *RouterIntegrationSuite) SetUpTest(c *check.C) {
cluster := &arvados.Cluster{}
cluster.TLS.Insecure = true
arvadostest.SetServiceURL(&cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
cluster := &arvados.Cluster{}
cluster.TLS.Insecure = true
arvadostest.SetServiceURL(&cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
- s.rtr = New(cluster)
+ url, _ := url.Parse("https://" + os.Getenv("ARVADOS_TEST_API_HOST"))
+ s.rtr = New(rpc.NewConn("zzzzz", url, true, rpc.PassthroughTokenProvider))
}
func (s *RouterIntegrationSuite) TearDownSuite(c *check.C) {
}
func (s *RouterIntegrationSuite) TearDownSuite(c *check.C) {