14287: Specify response Content-Type.

[arvados.git] / lib / controller / handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 06a5a84113dd36222a38f9e8cd971f0f46eac0f7..fbfb037d36dad0d4716c3422c452aec0a118049b 100644 (file)
--- 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,8 +46,10 @@ func (s *HandlerSuite) SetUpTest(c *check.C) {
        s.cluster = &arvados.Cluster{
                ClusterID:  "zzzzz",
                PostgreSQL: integrationTestCluster().PostgreSQL,
-               TLS:        arvados.TLS{Insecure: true},
+
+               EnableBetaController14287: enableBetaController14287,
        }
+       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:/")
        s.handler = newHandler(s.ctx, s.cluster, "")
@@ -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) {