X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e12c7f0bcb0f5cbe80a0274d1758c0dec57aa6e4..2a4c07b8a031b64714cd02b5e3caec413c849a31:/lib/controller/handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index cb69f2f6bb..fbfb037d36 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -22,9 +22,13 @@ import (
 	check "gopkg.in/check.v1"
 )
 
+var enableBetaController14287 bool
+
 // Gocheck boilerplate
 func Test(t *testing.T) {
-	check.TestingT(t)
+	for _, enableBetaController14287 = range []bool{false, true} {
+		check.TestingT(t)
+	}
 }
 
 var _ = check.Suite(&HandlerSuite{})
@@ -42,6 +46,8 @@ func (s *HandlerSuite) SetUpTest(c *check.C) {
 	s.cluster = &arvados.Cluster{
 		ClusterID:  "zzzzz",
 		PostgreSQL: integrationTestCluster().PostgreSQL,
+
+		EnableBetaController14287: enableBetaController14287,
 	}
 	s.cluster.TLS.Insecure = true
 	arvadostest.SetServiceURL(&s.cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
@@ -54,7 +60,10 @@ func (s *HandlerSuite) TearDownTest(c *check.C) {
 }
 
 func (s *HandlerSuite) TestConfigExport(c *check.C) {
-	s.cluster.Containers.CloudVMs.PollInterval = arvados.Duration(23 * time.Second)
+	s.cluster.ManagementToken = "secret"
+	s.cluster.SystemRootToken = "secret"
+	s.cluster.Collections.BlobSigning = true
+	s.cluster.Collections.BlobSigningTTL = arvados.Duration(23 * time.Second)
 	req := httptest.NewRequest("GET", "/arvados/v1/config", nil)
 	resp := httptest.NewRecorder()
 	s.handler.ServeHTTP(resp, req)
@@ -65,9 +74,8 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) {
 	c.Check(err, check.IsNil)
 	c.Check(cluster.ManagementToken, check.Equals, "")
 	c.Check(cluster.SystemRootToken, check.Equals, "")
-	c.Check(cluster.TLS.Insecure, check.Equals, true)
-	c.Check(cluster.Services.RailsAPI, check.DeepEquals, s.cluster.Services.RailsAPI)
-	c.Check(cluster.Containers.CloudVMs.PollInterval, check.Equals, arvados.Duration(23*time.Second))
+	c.Check(cluster.Collections.BlobSigning, check.DeepEquals, true)
+	c.Check(cluster.Collections.BlobSigningTTL, check.Equals, arvados.Duration(23*time.Second))
 }
 
 func (s *HandlerSuite) TestProxyDiscoveryDoc(c *check.C) {