X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fd3e91e6cd737554b4ae491a558e52f41bad3d07..91f976b99d4e7f00d2c1fbfee75812c3b1b780c6:/services/keep-web/server_test.go diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go index 6441364e99..21fa8a4b5c 100644 --- a/services/keep-web/server_test.go +++ b/services/keep-web/server_test.go @@ -1,3 +1,7 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + package main import ( @@ -77,7 +81,9 @@ func (s *IntegrationSuite) Test404(c *check.C) { } { hdr, body, _ := s.runCurl(c, arvadostest.ActiveToken, "collections.example.com", uri) c.Check(hdr, check.Matches, "(?s)HTTP/1.1 404 Not Found\r\n.*") - c.Check(body, check.Equals, "") + if len(body) > 0 { + c.Check(body, check.Equals, "404 page not found\n") + } } } @@ -311,13 +317,13 @@ func (s *IntegrationSuite) TearDownSuite(c *check.C) { func (s *IntegrationSuite) SetUpTest(c *check.C) { arvadostest.ResetEnv() - s.testServer = &server{Config: &Config{ - Client: arvados.Client{ - APIHost: testAPIHost, - Insecure: true, - }, - Listen: "127.0.0.1:0", - }} + cfg := DefaultConfig() + cfg.Client = arvados.Client{ + APIHost: testAPIHost, + Insecure: true, + } + cfg.Listen = "127.0.0.1:0" + s.testServer = &server{Config: cfg} err := s.testServer.Start() c.Assert(err, check.Equals, nil) }