[arvados] updated: 2.7.0-6481-g768ad30ab2
git repository hosting
git at public.arvados.org
Tue Apr 30 18:43:55 UTC 2024
Summary of changes:
lib/controller/handler_test.go | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
via 768ad30ab2bca603720cad1e1c6c54c437afec65 (commit)
from b7103b6069c2c04a9719036e54781231821bb2fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 768ad30ab2bca603720cad1e1c6c54c437afec65
Author: Tom Clegg <tom at curii.com>
Date: Tue Apr 30 14:43:13 2024 -0400
15397: Remove checks for nodes and repositories endpoints.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index dcd59409ad..7d5e693f5b 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -568,8 +568,10 @@ 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.Assert(resp.Code, check.Equals, http.StatusOK,
- check.Commentf("Wasn't able to get data from the controller at %q: %q", url, resp.Body.String()))
+ if !c.Check(resp.Code, check.Equals, http.StatusOK,
+ check.Commentf("Wasn't able to get data from the controller at %q: %q", url, resp.Body.String())) {
+ return
+ }
err = json.Unmarshal(resp.Body.Bytes(), &proxied)
c.Check(err, check.Equals, nil)
@@ -581,9 +583,11 @@ func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, ski
}
resp2, err := client.Get(s.cluster.Services.RailsAPI.ExternalURL.String() + url + "/?api_token=" + token)
c.Check(err, check.Equals, nil)
- c.Assert(resp2.StatusCode, check.Equals, http.StatusOK,
- check.Commentf("Wasn't able to get data from the RailsAPI at %q", url))
defer resp2.Body.Close()
+ if !c.Check(resp2.StatusCode, check.Equals, http.StatusOK,
+ check.Commentf("Wasn't able to get data from the RailsAPI at %q", url)) {
+ return
+ }
db, err := ioutil.ReadAll(resp2.Body)
c.Check(err, check.Equals, nil)
err = json.Unmarshal(db, &direct)
@@ -648,8 +652,6 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
"keep_services/" + ksUUID: nil,
"links/" + arvadostest.ActiveUserCanReadAllUsersLinkUUID: nil,
"logs/" + arvadostest.CrunchstatForRunningContainerLogUUID: nil,
- "nodes/" + arvadostest.IdleNodeUUID: nil,
- "repositories/" + arvadostest.ArvadosRepoUUID: nil,
"users/" + arvadostest.ActiveUserUUID: {"href": true},
"virtual_machines/" + arvadostest.TestVMUUID: nil,
"workflows/" + arvadostest.WorkflowWithDefinitionYAMLUUID: nil,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list