X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/16f704326f44fd1e5e5e60b936c9b5895d6a6ff8..cf0c4c381a2b34130f072096038a430e3c6bbe55:/services/crunch-run/git_mount_test.go diff --git a/services/crunch-run/git_mount_test.go b/services/crunch-run/git_mount_test.go index 4dc95bc3df..61ee24c911 100644 --- a/services/crunch-run/git_mount_test.go +++ b/services/crunch-run/git_mount_test.go @@ -6,11 +6,14 @@ package main import ( "io/ioutil" + "net/url" "os" "path/filepath" + "git.curoverse.com/arvados.git/lib/config" "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/arvadostest" + "git.curoverse.com/arvados.git/sdk/go/ctxlog" check "gopkg.in/check.v1" git_client "gopkg.in/src-d/go-git.v4/plumbing/transport/client" git_http "gopkg.in/src-d/go-git.v4/plumbing/transport/http" @@ -203,7 +206,11 @@ func (s *GitMountSuite) checkTmpdirContents(c *check.C, expect []string) { func (*GitMountSuite) useTestGitServer(c *check.C) { git_client.InstallProtocol("https", git_http.NewClient(arvados.InsecureHTTPClient)) - port, err := ioutil.ReadFile("../../tmp/arv-git-httpd-ssl.port") + loader := config.NewLoader(nil, ctxlog.TestLogger(c)) + cfg, err := loader.Load() c.Assert(err, check.IsNil) - discoveryMap["gitUrl"] = "https://localhost:" + string(port) + cluster, err := cfg.GetCluster("") + c.Assert(err, check.IsNil) + + discoveryMap["gitUrl"] = (*url.URL)(&cluster.Services.GitHTTP.ExternalURL).String() }