projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17682-fix-stutter'
[arvados.git]
/
lib
/
controller
/
server_test.go
diff --git
a/lib/controller/server_test.go
b/lib/controller/server_test.go
index a398af97b21884ae896f675b1c2ab00a59ae55d4..e3558c3f41bec4b47c01b2575e4793fbbebb7674 100644
(file)
--- a/
lib/controller/server_test.go
+++ b/
lib/controller/server_test.go
@@
-5,14
+5,15
@@
package controller
import (
package controller
import (
+ "context"
"net/http"
"os"
"path/filepath"
"net/http"
"os"
"path/filepath"
- "git.
curoverse.com
/arvados.git/sdk/go/arvados"
- "git.
curoverse.com
/arvados.git/sdk/go/arvadostest"
- "git.
curoverse.com
/arvados.git/sdk/go/ctxlog"
- "git.
curoverse.com
/arvados.git/sdk/go/httpserver"
+ "git.
arvados.org
/arvados.git/sdk/go/arvados"
+ "git.
arvados.org
/arvados.git/sdk/go/arvadostest"
+ "git.
arvados.org
/arvados.git/sdk/go/ctxlog"
+ "git.
arvados.org
/arvados.git/sdk/go/httpserver"
check "gopkg.in/check.v1"
)
check "gopkg.in/check.v1"
)
@@
-36,14
+37,16
@@
func newServerFromIntegrationTestEnv(c *check.C) *httpserver.Server {
handler := &Handler{Cluster: &arvados.Cluster{
ClusterID: "zzzzz",
PostgreSQL: integrationTestCluster().PostgreSQL,
handler := &Handler{Cluster: &arvados.Cluster{
ClusterID: "zzzzz",
PostgreSQL: integrationTestCluster().PostgreSQL,
- TLS: arvados.TLS{Insecure: true},
}}
}}
+ handler.Cluster.TLS.Insecure = true
arvadostest.SetServiceURL(&handler.Cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
arvadostest.SetServiceURL(&handler.Cluster.Services.Controller, "http://localhost:/")
srv := &httpserver.Server{
Server: http.Server{
arvadostest.SetServiceURL(&handler.Cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
arvadostest.SetServiceURL(&handler.Cluster.Services.Controller, "http://localhost:/")
srv := &httpserver.Server{
Server: http.Server{
- Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, handler)),
+ Handler: httpserver.HandlerWithContext(
+ ctxlog.Context(context.Background(), log),
+ httpserver.AddRequestIDs(httpserver.LogRequests(handler))),
},
Addr: ":",
}
},
Addr: ":",
}