15954: Logging and env var fixes.

[arvados.git] / lib / controller / handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index fac2f8a825529a2d5f3292318f64381c390599ba..d54f50cf1ff2a8b9f52c3149548e74257443dbb8 100644 (file)
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -228,11 +228,12 @@ func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, ski
        req.Header.Set("Authorization", "Bearer "+token)
        resp := httptest.NewRecorder()
        s.handler.ServeHTTP(resp, req)
-       c.Check(resp.Code, check.Equals, http.StatusOK)
+       c.Assert(resp.Code, check.Equals, http.StatusOK,
+               check.Commentf("Wasn't able to get data from the controller at %q", url))
        err = json.Unmarshal(resp.Body.Bytes(), &proxied)
        c.Check(err, check.Equals, nil)
 
-       // Get collection directly from railsAPI
+       // Get collection directly from RailsAPI
        client := &http.Client{
                Transport: &http.Transport{
                        TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
@@ -265,22 +266,33 @@ func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, ski
 }
 
 func (s *HandlerSuite) TestGetObjects(c *check.C) {
+       // Get the 1st keep service's uuid from the running test server.
+       req := httptest.NewRequest("GET", "/arvados/v1/keep_services/", nil)
+       req.Header.Set("Authorization", "Bearer "+arvadostest.AdminToken)
+       resp := httptest.NewRecorder()
+       s.handler.ServeHTTP(resp, req)
+       c.Assert(resp.Code, check.Equals, http.StatusOK)
+       var ksList arvados.KeepServiceList
+       json.Unmarshal(resp.Body.Bytes(), &ksList)
+       c.Assert(len(ksList.Items), check.Not(check.Equals), 0)
+       ksUUID := ksList.Items[0].UUID
+
        testCases := map[string]map[string]bool{
-               "api_clients/" + arvadostest.TrustedWorkbenchAPIClientUUID:     map[string]bool{},
-               "api_client_authorizations/" + arvadostest.AdminTokenUUID:      map[string]bool{},
-               "authorized_keys/" + arvadostest.AdminAuthorizedKeysUUID:       map[string]bool{},
-               "collections/" + arvadostest.FooCollection:                     map[string]bool{"href": true},
-               "containers/" + arvadostest.RunningContainerUUID:               map[string]bool{},
-               "container_requests/" + arvadostest.QueuedContainerRequestUUID: map[string]bool{},
-               "groups/" + arvadostest.AProjectUUID:                           map[string]bool{},
-               "keep_services/" + arvadostest.KeepServiceZeroUUID:             map[string]bool{},
-               "links/" + arvadostest.ActiveUserCanReadAllUsersLinkUUID:       map[string]bool{},
-               "logs/" + arvadostest.CrunchstatForRunningJobLogUUID:           map[string]bool{},
-               "nodes/" + arvadostest.IdleNodeUUID:                            map[string]bool{},
-               "repositories/" + arvadostest.ArvadosRepoUUID:                  map[string]bool{},
+               "api_clients/" + arvadostest.TrustedWorkbenchAPIClientUUID:     nil,
+               "api_client_authorizations/" + arvadostest.AdminTokenUUID:      nil,
+               "authorized_keys/" + arvadostest.AdminAuthorizedKeysUUID:       nil,
+               "collections/" + arvadostest.CollectionWithUniqueWordsUUID:     map[string]bool{"href": true},
+               "containers/" + arvadostest.RunningContainerUUID:               nil,
+               "container_requests/" + arvadostest.QueuedContainerRequestUUID: nil,
+               "groups/" + arvadostest.AProjectUUID:                           nil,
+               "keep_services/" + ksUUID:                                      nil,
+               "links/" + arvadostest.ActiveUserCanReadAllUsersLinkUUID:       nil,
+               "logs/" + arvadostest.CrunchstatForRunningJobLogUUID:           nil,
+               "nodes/" + arvadostest.IdleNodeUUID:                            nil,
+               "repositories/" + arvadostest.ArvadosRepoUUID:                  nil,
                "users/" + arvadostest.ActiveUserUUID:                          map[string]bool{"href": true},
-               "virtual_machines/" + arvadostest.TestVMUUID:                   map[string]bool{},
-               "workflows/" + arvadostest.WorkflowWithDefinitionYAMLUUID:      map[string]bool{},
+               "virtual_machines/" + arvadostest.TestVMUUID:                   nil,
+               "workflows/" + arvadostest.WorkflowWithDefinitionYAMLUUID:      nil,
        }
        for url, skippedFields := range testCases {
                s.CheckObjectType(c, "/arvados/v1/"+url, arvadostest.AdminToken, skippedFields)