[ARVADOS] updated: 1.3.0-2169-g3836d53ef

[Git user]

Summary of changes:
 services/keep-web/handler_test.go | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

       via  3836d53ef13841dad652e3faeb20660576279afd (commit)
      from  46d2ed57248419200d5716cfef8de9a1bb911240 (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 3836d53ef13841dad652e3faeb20660576279afd
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Sat Feb 15 16:47:34 2020 -0500

    16100: Move test to integration suite to avoid logging errors.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 488c91cdc..f6f3de887 100644
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -41,24 +41,6 @@ func (s *UnitSuite) SetUpTest(c *check.C) {
 	s.Config = cfg
 }
 
-func (s *UnitSuite) TestKeepClientBlockCache(c *check.C) {
-	cfg := newConfig(s.Config)
-	cfg.cluster.Collections.WebDAVCache.MaxBlockEntries = 42
-	h := handler{Config: cfg}
-	c.Check(keepclient.DefaultBlockCache.MaxBlocks, check.Not(check.Equals), cfg.cluster.Collections.WebDAVCache.MaxBlockEntries)
-	u := mustParseURL("http://keep-web.example/c=" + arvadostest.FooCollection + "/t=" + arvadostest.ActiveToken + "/foo")
-	req := &http.Request{
-		Method:     "GET",
-		Host:       u.Host,
-		URL:        u,
-		RequestURI: u.RequestURI(),
-	}
-	resp := httptest.NewRecorder()
-	h.ServeHTTP(resp, req)
-	c.Check(resp.Code, check.Equals, http.StatusOK)
-	c.Check(keepclient.DefaultBlockCache.MaxBlocks, check.Equals, cfg.cluster.Collections.WebDAVCache.MaxBlockEntries)
-}
-
 func (s *UnitSuite) TestCORSPreflight(c *check.C) {
 	h := handler{Config: newConfig(s.Config)}
 	u := mustParseURL("http://keep-web.example/c=" + arvadostest.FooCollection + "/foo")
@@ -994,6 +976,22 @@ func (s *IntegrationSuite) TestFileContentType(c *check.C) {
 	}
 }
 
+func (s *IntegrationSuite) TestKeepClientBlockCache(c *check.C) {
+	s.testServer.Config.cluster.Collections.WebDAVCache.MaxBlockEntries = 42
+	c.Check(keepclient.DefaultBlockCache.MaxBlocks, check.Not(check.Equals), 42)
+	u := mustParseURL("http://keep-web.example/c=" + arvadostest.FooCollection + "/t=" + arvadostest.ActiveToken + "/foo")
+	req := &http.Request{
+		Method:     "GET",
+		Host:       u.Host,
+		URL:        u,
+		RequestURI: u.RequestURI(),
+	}
+	resp := httptest.NewRecorder()
+	s.testServer.Handler.ServeHTTP(resp, req)
+	c.Check(resp.Code, check.Equals, http.StatusOK)
+	c.Check(keepclient.DefaultBlockCache.MaxBlocks, check.Equals, 42)
+}
+
 func copyHeader(h http.Header) http.Header {
 	hc := http.Header{}
 	for k, v := range h {

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


hooks/post-receive
--