[ARVADOS] updated: 1.3.0-2147-g484cf9fec

[Git user]

Summary of changes:
 lib/controller/handler_test.go | 13 ++++++++++++-
 sdk/go/arvadostest/fixtures.go |  2 --
 2 files changed, 12 insertions(+), 3 deletions(-)

       via  484cf9fec8734bc465b7d90cdfc26e1437d402cf (commit)
      from  1da59913e052cd419c4e43b4c7c6f569a94851bd (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 484cf9fec8734bc465b7d90cdfc26e1437d402cf
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Mon Feb 10 16:22:07 2020 -0300

    16141: Fixes test to use the 1st keep_service's uuid the test server returns.
    
    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 f1d6f15e3..5e058ff91 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -266,6 +266,17 @@ 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{},
@@ -274,7 +285,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
 		"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{},
+		"keep_services/" + ksUUID:                                      map[string]bool{},
 		"links/" + arvadostest.ActiveUserCanReadAllUsersLinkUUID:       map[string]bool{},
 		"logs/" + arvadostest.CrunchstatForRunningJobLogUUID:           map[string]bool{},
 		"nodes/" + arvadostest.IdleNodeUUID:                            map[string]bool{},
diff --git a/sdk/go/arvadostest/fixtures.go b/sdk/go/arvadostest/fixtures.go
index 8a461473d..7d3979581 100644
--- a/sdk/go/arvadostest/fixtures.go
+++ b/sdk/go/arvadostest/fixtures.go
@@ -60,8 +60,6 @@ const (
 
 	CollectionReplicationDesired2Confirmed2UUID = "zzzzz-4zz18-434zv1tnnf2rygp"
 
-	KeepServiceZeroUUID = "zzzzz-bi6l4-6zhilxar6r8ey90"
-
 	ActiveUserCanReadAllUsersLinkUUID = "zzzzz-o0j2j-ctbysaduejxfrs5"
 
 	TrustedWorkbenchAPIClientUUID = "zzzzz-ozdt8-teyxzyd8qllg11h"

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


hooks/post-receive
--