From 64dc3f43d2ab72bad15e2da912adf970ad23182b Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 11 Feb 2020 13:41:41 -0300 Subject: [PATCH] 16141: Updates the test to use a different, more complete collection fixture. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- lib/controller/handler_test.go | 28 ++++++++++++++-------------- sdk/go/arvadostest/fixtures.go | 2 ++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go index 5e058ff91b..d54f50cf1f 100644 --- a/lib/controller/handler_test.go +++ b/lib/controller/handler_test.go @@ -278,21 +278,21 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) { 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/" + ksUUID: 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) diff --git a/sdk/go/arvadostest/fixtures.go b/sdk/go/arvadostest/fixtures.go index 7d3979581c..5677f4deca 100644 --- a/sdk/go/arvadostest/fixtures.go +++ b/sdk/go/arvadostest/fixtures.go @@ -71,6 +71,8 @@ const ( IdleNodeUUID = "zzzzz-7ekkf-2z3mc76g2q73aio" TestVMUUID = "zzzzz-2x53u-382brsig8rp3064" + + CollectionWithUniqueWordsUUID = "zzzzz-4zz18-mnt690klmb51aud" ) // PathologicalManifest : A valid manifest designed to test -- 2.30.2