Merge branch 'main' from workbench2.git

[arvados.git] / sdk / go / health / handler_test.go

diff --git a/sdk/go/health/handler_test.go b/sdk/go/health/handler_test.go
index 055e2c3d8dd603165a3fff9e6d64335baa6d78c7..097e292d386bc540b1955d37ce1506afbef3e933 100644 (file)
--- a/sdk/go/health/handler_test.go
+++ b/sdk/go/health/handler_test.go
@@ -58,6 +58,18 @@ func (s *Suite) TestPassFailRefuse(c *check.C) {
        resp = httptest.NewRecorder()
        h.ServeHTTP(resp, s.request("/_health/miracle", ""))
        c.Check(resp.Code, check.Equals, http.StatusUnauthorized)
+
+       resp = httptest.NewRecorder()
+       h.ServeHTTP(resp, s.request("/_health/theperthcountyconspiracy", ""))
+       c.Check(resp.Code, check.Equals, http.StatusNotFound)
+
+       resp = httptest.NewRecorder()
+       h.ServeHTTP(resp, s.request("/x/miracle", ""))
+       c.Check(resp.Code, check.Equals, http.StatusNotFound)
+
+       resp = httptest.NewRecorder()
+       h.ServeHTTP(resp, s.request("/miracle", ""))
+       c.Check(resp.Code, check.Equals, http.StatusNotFound)
 }
 
 func (s *Suite) TestPingOverride(c *check.C) {
@@ -69,9 +81,8 @@ func (s *Suite) TestPingOverride(c *check.C) {
                                ok = !ok
                                if ok {
                                        return nil
-                               } else {
-                                       return errors.New("good error")
                                }
+                               return errors.New("good error")
                        },
                },
        }
@@ -84,10 +95,14 @@ func (s *Suite) TestPingOverride(c *check.C) {
        s.checkUnhealthy(c, resp)
 }
 
-func (s *Suite) TestZeroValue(c *check.C) {
+func (s *Suite) TestZeroValueIsDisabled(c *check.C) {
        resp := httptest.NewRecorder()
        (&Handler{}).ServeHTTP(resp, s.request("/ping", goodToken))
        c.Check(resp.Code, check.Equals, http.StatusNotFound)
+
+       resp = httptest.NewRecorder()
+       (&Handler{}).ServeHTTP(resp, s.request("/ping", ""))
+       c.Check(resp.Code, check.Equals, http.StatusNotFound)
 }
 
 func (s *Suite) request(path, token string) *http.Request {