X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3b3c3a0869c2cf528b9e1c45c969bbbd47f6446e..3e1c43866e5b523c3f1d273c25942ad56dc66d3f:/services/keep-web/server_test.go diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go index 52fe459ec4..ee585ad5b2 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 ( @@ -55,7 +59,6 @@ func (s *IntegrationSuite) TestNoToken(c *check.C) { func (s *IntegrationSuite) Test404(c *check.C) { for _, uri := range []string{ // Routing errors (always 404 regardless of what's stored in Keep) - "/", "/foo", "/download", "/collections", @@ -77,7 +80,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") + } } } @@ -267,7 +272,6 @@ func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ... // Discard (but measure size of) anything past 128 MiB. var discarded int64 if err == io.ErrUnexpectedEOF { - err = nil buf = buf[:n] } else { c.Assert(err, check.Equals, nil)