Merge branch 'master' into 13822-nm-delayed-daemon

[arvados.git] / services / keep-web / server_test.go

diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index 6441364e99fcc93d4da26f4c1f6fe150c740be7b..ee585ad5b212af1f12f2bad3f162f8c1c11f3a2f 100644 (file)
--- 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)
@@ -311,13 +315,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)
 }