11901: Test 404 when health checks disabled.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/services/ws/server_test.go b/services/ws/server_test.go
index da7440d0e0b98e10092b434655fa0b399d502066..a0c4c8ccde0e3ab2bbf15412c6f82a525a971bee 100644 (file)
--- a/services/ws/server_test.go
+++ b/services/ws/server_test.go
@@ -65,6 +65,7 @@ func (s *serverSuite) TestBadDB(c *check.C) {
 
 func (s *serverSuite) TestHealth(c *check.C) {
        go s.srv.Run()
+       defer s.srv.Close()
        s.srv.WaitReady()
        for _, token := range []string{"", "foo", s.cfg.ManagementToken} {
                req, err := http.NewRequest("GET", "http://"+s.srv.listener.Addr().String()+"/_health/ping", nil)
@@ -84,3 +85,18 @@ func (s *serverSuite) TestHealth(c *check.C) {
                }
        }
 }
+
+func (s *serverSuite) TestHealthDisabled(c *check.C) {
+       s.cfg.ManagementToken = ""
+
+       go s.srv.Run()
+       defer s.srv.Close()
+       s.srv.WaitReady()
+
+       req, err := http.NewRequest("GET", "http://"+s.srv.listener.Addr().String()+"/_health/ping", nil)
+       c.Assert(err, check.IsNil)
+       req.Header.Add("Authorization", "Bearer "+arvadostest.ManagementToken)
+       resp, err := http.DefaultClient.Do(req)
+       c.Check(err, check.IsNil)
+       c.Check(resp.StatusCode, check.Equals, http.StatusNotFound)
+}