X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6ddd57f1da6139b76db95ad16cccbb95eab01e5d..e5394906b154b630699c0edd4add36eca34611b3:/lib/controller/integration_test.go

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index c532efa0b6..fc1f705175 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -72,6 +72,8 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
       Insecure: true
     SystemLogs:
       Format: text
+    API:
+      MaxConcurrentRequests: 128
     Containers:
       CloudVMs:
         Enable: true
@@ -499,6 +501,7 @@ func (s *IntegrationSuite) TestCreateContainerRequestWithFedToken(c *check.C) {
 	req.Header.Set("Authorization", "OAuth2 "+ac2.AuthToken)
 	resp, err = arvados.InsecureHTTPClient.Do(req)
 	c.Assert(err, check.IsNil)
+	defer resp.Body.Close()
 	err = json.NewDecoder(resp.Body).Decode(&cr)
 	c.Check(err, check.IsNil)
 	c.Check(cr.UUID, check.Matches, "z2222-.*")
@@ -536,8 +539,10 @@ func (s *IntegrationSuite) TestCreateContainerRequestWithBadToken(c *check.C) {
 		c.Assert(err, check.IsNil)
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := ac1.Do(req)
-		c.Assert(err, check.IsNil)
-		c.Assert(resp.StatusCode, check.Equals, tt.expectedCode)
+		if c.Check(err, check.IsNil) {
+			c.Assert(resp.StatusCode, check.Equals, tt.expectedCode)
+			resp.Body.Close()
+		}
 	}
 }
 
@@ -605,9 +610,11 @@ func (s *IntegrationSuite) TestRequestIDHeader(c *check.C) {
 			var jresp httpserver.ErrorResponse
 			err := json.NewDecoder(resp.Body).Decode(&jresp)
 			c.Check(err, check.IsNil)
-			c.Assert(jresp.Errors, check.HasLen, 1)
-			c.Check(jresp.Errors[0], check.Matches, `.*\(`+respHdr+`\).*`)
+			if c.Check(jresp.Errors, check.HasLen, 1) {
+				c.Check(jresp.Errors[0], check.Matches, `.*\(`+respHdr+`\).*`)
+			}
 		}
+		resp.Body.Close()
 	}
 }
 
@@ -1224,6 +1231,17 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, token stri
 		return cfs
 	}
 
+	checkwebdavlogs := func(cr arvados.ContainerRequest) {
+		req, err := http.NewRequest("OPTIONS", "https://"+ac.APIHost+"/arvados/v1/container_requests/"+cr.UUID+"/log/"+cr.ContainerUUID+"/", nil)
+		c.Assert(err, check.IsNil)
+		req.Header.Set("Origin", "http://example.example")
+		resp, err := ac.Do(req)
+		c.Assert(err, check.IsNil)
+		c.Check(resp.StatusCode, check.Equals, http.StatusOK)
+		// Check for duplicate headers -- must use Header[], not Header.Get()
+		c.Check(resp.Header["Access-Control-Allow-Origin"], check.DeepEquals, []string{"*"})
+	}
+
 	var ctr arvados.Container
 	var lastState arvados.ContainerState
 	deadline := time.Now().Add(time.Minute)
@@ -1239,7 +1257,11 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, token stri
 		} else {
 			if time.Now().After(deadline) {
 				c.Errorf("timed out, container state is %q", cr.State)
-				showlogs(ctr.Log)
+				if ctr.Log == "" {
+					c.Logf("=== NO LOG COLLECTION saved for container")
+				} else {
+					showlogs(ctr.Log)
+				}
 				c.FailNow()
 			}
 			time.Sleep(time.Second / 2)
@@ -1254,5 +1276,6 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, token stri
 		c.Assert(err, check.IsNil)
 	}
 	logcfs = showlogs(cr.LogUUID)
+	checkwebdavlogs(cr)
 	return outcoll, logcfs
 }