[arvados] updated: 2.7.1-44-g199c5da077

[git repository hosting]

Summary of changes:
 lib/controller/integration_test.go | 2 --
 1 file changed, 2 deletions(-)

       via  199c5da077b0a345937089f7389c252524dd1270 (commit)
      from  28ced00f6b373b06abafd6d067de46fe15c16573 (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 199c5da077b0a345937089f7389c252524dd1270
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 2 10:55:28 2024 -0400

    Fix merge conflict in test case.
    
    Disk cache cannot be disabled here because it does not exist yet in
    2.7.
    
    refs #21617
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index a76e707c8d..217af6aec7 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -229,10 +229,8 @@ func (s *IntegrationSuite) testFederationCollectionAccess(c *check.C, writeClust
 
 	connW := s.super.Conn(writeCluster)
 	userctxW, acW, kcW := s.super.ClientsWithToken(writeCluster, ac1.AuthToken)
-	kcW.DiskCacheSize = keepclient.DiskCacheDisabled
 	connR := s.super.Conn(readCluster)
 	userctxR, acR, kcR := s.super.ClientsWithToken(readCluster, ac1.AuthToken)
-	kcR.DiskCacheSize = keepclient.DiskCacheDisabled
 
 	filedata := fmt.Sprintf("%s: write to %s, read from %s", c.TestName(), writeCluster, readCluster)
 	mtxt := s.createTestCollectionManifest(c, acW, kcW, filedata)

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


hooks/post-receive
--