X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f26e039288e744510a6478b7b2597d3c494fb2d1..9df2ccdfc085a8b33aed9568c433b7f6e2c24353:/lib/controller/handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index f09203f724..7d8266a85c 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -52,6 +52,7 @@ func (s *HandlerSuite) SetUpTest(c *check.C) {
 		PostgreSQL:       integrationTestCluster().PostgreSQL,
 		ForceLegacyAPI14: forceLegacyAPI14,
 	}
+	s.cluster.API.RequestTimeout = arvados.Duration(5 * time.Minute)
 	s.cluster.TLS.Insecure = true
 	arvadostest.SetServiceURL(&s.cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
 	arvadostest.SetServiceURL(&s.cluster.Services.Controller, "http://localhost:/")
@@ -71,7 +72,10 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) {
 		req := httptest.NewRequest(method, "/arvados/v1/config", nil)
 		resp := httptest.NewRecorder()
 		s.handler.ServeHTTP(resp, req)
-		c.Check(resp.Code, check.Equals, http.StatusOK)
+		c.Log(resp.Body.String())
+		if !c.Check(resp.Code, check.Equals, http.StatusOK) {
+			continue
+		}
 		c.Check(resp.Header().Get("Access-Control-Allow-Origin"), check.Equals, `*`)
 		c.Check(resp.Header().Get("Access-Control-Allow-Methods"), check.Matches, `.*\bGET\b.*`)
 		c.Check(resp.Header().Get("Access-Control-Allow-Headers"), check.Matches, `.+`)
@@ -80,12 +84,11 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) {
 			continue
 		}
 		var cluster arvados.Cluster
-		c.Log(resp.Body.String())
 		err := json.Unmarshal(resp.Body.Bytes(), &cluster)
 		c.Check(err, check.IsNil)
 		c.Check(cluster.ManagementToken, check.Equals, "")
 		c.Check(cluster.SystemRootToken, check.Equals, "")
-		c.Check(cluster.Collections.BlobSigning, check.DeepEquals, true)
+		c.Check(cluster.Collections.BlobSigning, check.Equals, true)
 		c.Check(cluster.Collections.BlobSigningTTL, check.Equals, arvados.Duration(23*time.Second))
 	}
 }
@@ -167,8 +170,9 @@ func (s *HandlerSuite) TestProxyNotFound(c *check.C) {
 }
 
 func (s *HandlerSuite) TestProxyRedirect(c *check.C) {
-	s.cluster.Login.ProviderAppID = "test"
-	s.cluster.Login.ProviderAppSecret = "test"
+	s.cluster.Login.SSO.Enable = true
+	s.cluster.Login.SSO.ProviderAppID = "test"
+	s.cluster.Login.SSO.ProviderAppSecret = "test"
 	req := httptest.NewRequest("GET", "https://0.0.0.0:1/login?return_to=foo", nil)
 	resp := httptest.NewRecorder()
 	s.handler.ServeHTTP(resp, req)
@@ -182,7 +186,8 @@ func (s *HandlerSuite) TestProxyRedirect(c *check.C) {
 }
 
 func (s *HandlerSuite) TestLogoutSSO(c *check.C) {
-	s.cluster.Login.ProviderAppID = "test"
+	s.cluster.Login.SSO.Enable = true
+	s.cluster.Login.SSO.ProviderAppID = "test"
 	req := httptest.NewRequest("GET", "https://0.0.0.0:1/logout?return_to=https://example.com/foo", nil)
 	resp := httptest.NewRecorder()
 	s.handler.ServeHTTP(resp, req)
@@ -197,7 +202,8 @@ func (s *HandlerSuite) TestLogoutGoogle(c *check.C) {
 		// Google login N/A
 		return
 	}
-	s.cluster.Login.GoogleClientID = "test"
+	s.cluster.Login.Google.Enable = true
+	s.cluster.Login.Google.ClientID = "test"
 	req := httptest.NewRequest("GET", "https://0.0.0.0:1/logout?return_to=https://example.com/foo", nil)
 	resp := httptest.NewRecorder()
 	s.handler.ServeHTTP(resp, req)
@@ -328,7 +334,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
 		"api_clients/" + arvadostest.TrustedWorkbenchAPIClientUUID:     nil,
 		"api_client_authorizations/" + arvadostest.AdminTokenUUID:      nil,
 		"authorized_keys/" + arvadostest.AdminAuthorizedKeysUUID:       nil,
-		"collections/" + arvadostest.CollectionWithUniqueWordsUUID:     map[string]bool{"href": true},
+		"collections/" + arvadostest.CollectionWithUniqueWordsUUID:     {"href": true},
 		"containers/" + arvadostest.RunningContainerUUID:               nil,
 		"container_requests/" + arvadostest.QueuedContainerRequestUUID: nil,
 		"groups/" + arvadostest.AProjectUUID:                           nil,
@@ -337,7 +343,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
 		"logs/" + arvadostest.CrunchstatForRunningJobLogUUID:           nil,
 		"nodes/" + arvadostest.IdleNodeUUID:                            nil,
 		"repositories/" + arvadostest.ArvadosRepoUUID:                  nil,
-		"users/" + arvadostest.ActiveUserUUID:                          map[string]bool{"href": true},
+		"users/" + arvadostest.ActiveUserUUID:                          {"href": true},
 		"virtual_machines/" + arvadostest.TestVMUUID:                   nil,
 		"workflows/" + arvadostest.WorkflowWithDefinitionYAMLUUID:      nil,
 	}