X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bbc35c5bc1ae72ef2b635292f490f2b0cf3f5475..4aaa1f6aeae33dc353ea3a70f901065b4f694fed:/services/keep-web/server_test.go diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go index fdbb50e79f..324588a29a 100644 --- a/services/keep-web/server_test.go +++ b/services/keep-web/server_test.go @@ -28,17 +28,17 @@ func (s *IntegrationSuite) TestNoToken(c *check.C) { "", "bogustoken", } { - hdr, body, _ := s.runCurl(c, token, "dl.example.com", "/collections/"+arvadostest.FooCollection+"/foo") + hdr, body, _ := s.runCurl(c, token, "collections.example.com", "/collections/"+arvadostest.FooCollection+"/foo") c.Check(hdr, check.Matches, `(?s)HTTP/1.1 404 Not Found\r\n.*`) c.Check(body, check.Equals, "") if token != "" { - hdr, body, _ = s.runCurl(c, token, "dl.example.com", "/collections/download/"+arvadostest.FooCollection+"/"+token+"/foo") + hdr, body, _ = s.runCurl(c, token, "collections.example.com", "/collections/download/"+arvadostest.FooCollection+"/"+token+"/foo") c.Check(hdr, check.Matches, `(?s)HTTP/1.1 404 Not Found\r\n.*`) c.Check(body, check.Equals, "") } - hdr, body, _ = s.runCurl(c, token, "dl.example.com", "/bad-route") + hdr, body, _ = s.runCurl(c, token, "collections.example.com", "/bad-route") c.Check(hdr, check.Matches, `(?s)HTTP/1.1 404 Not Found\r\n.*`) c.Check(body, check.Equals, "") } @@ -50,14 +50,18 @@ func (s *IntegrationSuite) TestNoToken(c *check.C) { // really works against the server. func (s *IntegrationSuite) Test404(c *check.C) { for _, uri := range []string{ - // Routing errors + // Routing errors (always 404 regardless of what's stored in Keep) "/", "/foo", "/download", "/collections", "/collections/", + // Implicit/generated index is not implemented yet; + // until then, return 404. "/collections/" + arvadostest.FooCollection, "/collections/" + arvadostest.FooCollection + "/", + "/collections/" + arvadostest.FooBarDirCollection + "/dir1", + "/collections/" + arvadostest.FooBarDirCollection + "/dir1/", // Non-existent file in collection "/collections/" + arvadostest.FooCollection + "/theperthcountyconspiracy", "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/theperthcountyconspiracy", @@ -67,7 +71,7 @@ func (s *IntegrationSuite) Test404(c *check.C) { "/collections/" + arvadostest.NonexistentCollection + "/theperthcountyconspiracy", "/collections/download/" + arvadostest.NonexistentCollection + "/" + arvadostest.ActiveToken + "/theperthcountyconspiracy", } { - hdr, body, _ := s.runCurl(c, arvadostest.ActiveToken, "dl.example.com", uri) + hdr, body, _ := s.runCurl(c, arvadostest.ActiveToken, "collections.example.com", uri) c.Check(hdr, check.Matches, "(?s)HTTP/1.1 404 Not Found\r\n.*") c.Check(body, check.Equals, "") } @@ -80,8 +84,14 @@ func (s *IntegrationSuite) Test1GBFile(c *check.C) { s.test100BlockFile(c, 10000000) } -func (s *IntegrationSuite) Test300MBFile(c *check.C) { - s.test100BlockFile(c, 3000000) +func (s *IntegrationSuite) Test100BlockFile(c *check.C) { + if testing.Short() { + // 3 MB + s.test100BlockFile(c, 30000) + } else { + // 300 MB + s.test100BlockFile(c, 3000000) + } } func (s *IntegrationSuite) test100BlockFile(c *check.C, blocksize int) { @@ -105,14 +115,14 @@ func (s *IntegrationSuite) test100BlockFile(c *check.C, blocksize int) { err = arv.Create("collections", map[string]interface{}{ "collection": map[string]interface{}{ - "name": fmt.Sprintf("testdata blocksize=%d", blocksize), + "name": fmt.Sprintf("testdata blocksize=%d", blocksize), "manifest_text": mtext, }, }, &coll) c.Assert(err, check.Equals, nil) uuid := coll["uuid"].(string) - hdr, body, size := s.runCurl(c, arv.ApiToken, uuid + ".dl.example.com", "/testdata.bin") + hdr, body, size := s.runCurl(c, arv.ApiToken, uuid+".collections.example.com", "/testdata.bin") c.Check(hdr, check.Matches, `(?s)HTTP/1.1 200 OK\r\n.*`) c.Check(hdr, check.Matches, `(?si).*Content-length: `+fmt.Sprintf("%d00", blocksize)+`\r\n.*`) c.Check([]byte(body)[:1234], check.DeepEquals, testdata[:1234]) @@ -120,7 +130,6 @@ func (s *IntegrationSuite) test100BlockFile(c *check.C, blocksize int) { } type curlCase struct { - id string auth string host string path string @@ -129,98 +138,97 @@ type curlCase struct { func (s *IntegrationSuite) Test200(c *check.C) { anonymousTokens = []string{arvadostest.AnonymousToken} - arv, err := arvadosclient.MakeArvadosClient() - c.Assert(err, check.Equals, nil) - arv.ApiToken = arvadostest.ActiveToken - kc, err := keepclient.MakeKeepClient(&arv) - c.Assert(err, check.Equals, nil) - kc.PutB([]byte("Hello world\n")) - kc.PutB([]byte("foo")) for _, spec := range []curlCase{ // My collection { - auth: arvadostest.ActiveToken, - host: arvadostest.FooCollection + "--dl.example.com", - path: "/foo", + auth: arvadostest.ActiveToken, + host: arvadostest.FooCollection + "--collections.example.com", + path: "/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, { - host: strings.Replace(arvadostest.FooPdh, "+", "-", 1) + ".dl.example.com", - path: "/t=" + arvadostest.ActiveToken + "/foo", + auth: arvadostest.ActiveToken, + host: arvadostest.FooCollection + ".collections.example.com", + path: "/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, { - path: "/c=" + arvadostest.FooPdh + "/t=" + arvadostest.ActiveToken + "/foo", + host: strings.Replace(arvadostest.FooPdh, "+", "-", 1) + ".collections.example.com", + path: "/t=" + arvadostest.ActiveToken + "/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, { - path: "/c=" + strings.Replace(arvadostest.FooPdh, "+", "-", 1) + "/t=" + arvadostest.ActiveToken + "/_/foo", + path: "/c=" + arvadostest.FooPdh + "/t=" + arvadostest.ActiveToken + "/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, { - path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", + path: "/c=" + strings.Replace(arvadostest.FooPdh, "+", "-", 1) + "/t=" + arvadostest.ActiveToken + "/_/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, { - auth: "tokensobogus", - path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", + path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, { - auth: arvadostest.ActiveToken, - path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", + auth: "tokensobogus", + path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, { - auth: arvadostest.AnonymousToken, - path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", + auth: arvadostest.ActiveToken, + path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", + dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", + }, + { + auth: arvadostest.AnonymousToken, + path: "/collections/download/" + arvadostest.FooCollection + "/" + arvadostest.ActiveToken + "/foo", dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8", }, - // Anonymously accessible user agreement + // Anonymously accessible data { - path: "/c=" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", + path: "/c=" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, { - host: arvadostest.HelloWorldCollection + ".dl.example.com", - path: "/Hello%20world.txt", + host: arvadostest.HelloWorldCollection + ".collections.example.com", + path: "/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, { - host: arvadostest.HelloWorldCollection + ".dl.example.com", - path: "/_/Hello%20world.txt", + host: arvadostest.HelloWorldCollection + ".collections.example.com", + path: "/_/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, { - path: "/collections/" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", + path: "/collections/" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, { - auth: arvadostest.ActiveToken, - path: "/collections/" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", + auth: arvadostest.ActiveToken, + path: "/collections/" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, { - auth: arvadostest.SpectatorToken, - path: "/collections/" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", + auth: arvadostest.SpectatorToken, + path: "/collections/" + arvadostest.HelloWorldCollection + "/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, { - auth: arvadostest.SpectatorToken, - host: arvadostest.HelloWorldCollection + "--dl.example.com", - path: "/Hello%20world.txt", + auth: arvadostest.SpectatorToken, + host: arvadostest.HelloWorldCollection + "--collections.example.com", + path: "/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, { - auth: arvadostest.SpectatorToken, - path: "/collections/download/" + arvadostest.HelloWorldCollection + "/" + arvadostest.SpectatorToken + "/Hello%20world.txt", + auth: arvadostest.SpectatorToken, + path: "/collections/download/" + arvadostest.HelloWorldCollection + "/" + arvadostest.SpectatorToken + "/Hello%20world.txt", dataMD5: "f0ef7081e1539ac00ef5b761b4fb01b3", }, } { host := spec.host if host == "" { - host = "dl.example.com" + host = "collections.example.com" } hdr, body, _ := s.runCurl(c, spec.auth, host, spec.path) c.Check(hdr, check.Matches, `(?s)HTTP/1.1 200 OK\r\n.*`) @@ -238,7 +246,7 @@ func (s *IntegrationSuite) Test200(c *check.C) { func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ...string) (hdr, bodyPart string, bodySize int64) { curlArgs := []string{"--silent", "--show-error", "--include"} testHost, testPort, _ := net.SplitHostPort(s.testServer.Addr) - curlArgs = append(curlArgs, "--resolve", host + ":" + testPort + ":" + testHost) + curlArgs = append(curlArgs, "--resolve", host+":"+testPort+":"+testHost) if token != "" { curlArgs = append(curlArgs, "-H", "Authorization: OAuth2 "+token) } @@ -280,11 +288,20 @@ func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ... func (s *IntegrationSuite) SetUpSuite(c *check.C) { arvadostest.StartAPI() - arvadostest.StartKeep() + arvadostest.StartKeep(2, true) + + arv, err := arvadosclient.MakeArvadosClient() + c.Assert(err, check.Equals, nil) + arv.ApiToken = arvadostest.ActiveToken + kc, err := keepclient.MakeKeepClient(&arv) + c.Assert(err, check.Equals, nil) + kc.PutB([]byte("Hello world\n")) + kc.PutB([]byte("foo")) + kc.PutB([]byte("foobar")) } func (s *IntegrationSuite) TearDownSuite(c *check.C) { - arvadostest.StopKeep() + arvadostest.StopKeep(2) arvadostest.StopAPI() }