From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Tue, 6 Aug 2019 13:08:54 +0000 (-0300)
Subject: 14716: Analyzing integration test fix failure
X-Git-Tag: 2.0.0~223^2~16
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/2c7b49e8791154db907616243c930c552aeb3df3

14716: Analyzing integration test fix failure

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
---

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 083040b219..fab004c89f 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -281,6 +281,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
 			stripParts = 4
 			pathToken = true
 		} else {
+			log.Info("  !!!!  ATTN: Into /collections/uuid/path with anon token: ", h.Config.cluster.Users.AnonymousUserToken)
 			// /collections/ID/PATH...
 			collectionID = parseCollectionIDFromURL(pathParts[1])
 			tokens = []string{h.Config.cluster.Users.AnonymousUserToken}
diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 3863265613..17719601a9 100644
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -594,12 +594,12 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
 			cutDirs: 1,
 		},
 		// This test case fails
-		// {
-		// 	uri:     "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/",
-		// 	header:  authHeader,
-		// 	expect:  []string{"dir1/foo", "dir1/bar"},
-		// 	cutDirs: 2,
-		// },
+		{
+			uri:     "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/",
+			header:  authHeader,
+			expect:  []string{"dir1/foo", "dir1/bar"},
+			cutDirs: 2,
+		},
 		{
 			uri:     "download.example.com/users/active/foo_file_in_dir/",
 			header:  authHeader,
diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index 534ed9b302..b398f34065 100644
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -501,6 +501,7 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
 	cfg.cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: listen}] = arvados.ServiceInstance{}
 	cfg.cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: listen}] = arvados.ServiceInstance{}
 	cfg.cluster.ManagementToken = arvadostest.ManagementToken
+	cfg.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
 	s.testServer = &server{Config: cfg}
 	err = s.testServer.Start()
 	c.Assert(err, check.Equals, nil)