[ARVADOS] updated: 1.3.0-2149-g64dc3f43d

Git user git at public.arvados.org
Tue Feb 11 16:42:08 UTC 2020


Summary of changes:
 lib/controller/handler_test.go | 28 ++++++++++++++--------------
 sdk/go/arvados/collection.go   |  8 ++++----
 sdk/go/arvadostest/fixtures.go |  2 ++
 3 files changed, 20 insertions(+), 18 deletions(-)

       via  64dc3f43d2ab72bad15e2da912adf970ad23182b (commit)
       via  8713b30dcd6169c56bf6bd59918794f70cc8c158 (commit)
      from  484cf9fec8734bc465b7d90cdfc26e1437d402cf (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 64dc3f43d2ab72bad15e2da912adf970ad23182b
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Feb 11 13:41:41 2020 -0300

    16141: Updates the test to use a different, more complete collection fixture.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 5e058ff91..d54f50cf1 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 7d3979581..5677f4dec 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

commit 8713b30dcd6169c56bf6bd59918794f70cc8c158
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Feb 11 13:41:17 2020 -0300

    16141: Fixes GoSDK's Collection type.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 623a8d985..35fd3fd74 100644
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -24,8 +24,8 @@ type Collection struct {
 	Name                      string                 `json:"name"`
 	CreatedAt                 time.Time              `json:"created_at"`
 	ModifiedAt                time.Time              `json:"modified_at"`
-	ModifiedByClientUUID      *string                `json:"modified_by_client_uuid"`
-	ModifiedByUserUUID        *string                `json:"modified_by_user_uuid"`
+	ModifiedByClientUUID      string                 `json:"modified_by_client_uuid"`
+	ModifiedByUserUUID        string                 `json:"modified_by_user_uuid"`
 	PortableDataHash          string                 `json:"portable_data_hash"`
 	ReplicationConfirmed      *int                   `json:"replication_confirmed"`
 	ReplicationConfirmedAt    *time.Time             `json:"replication_confirmed_at"`
@@ -39,10 +39,10 @@ type Collection struct {
 	WritableBy                []string               `json:"writable_by,omitempty"`
 	FileCount                 int                    `json:"file_count"`
 	FileSizeTotal             int64                  `json:"file_size_total"`
-	Version                   *int                   `json:"version"`
+	Version                   int                    `json:"version"`
 	PreserveVersion           bool                   `json:"preserve_version"`
 	CurrentVersionUUID        string                 `json:"current_version_uuid"`
-	Description               *string                `json:"description"`
+	Description               string                 `json:"description"`
 }
 
 func (c Collection) resourceName() string {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list