projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak text saying which version of Ruby to install & add upgrade note
[arvados.git]
/
services
/
keep-web
/
server_test.go
diff --git
a/services/keep-web/server_test.go
b/services/keep-web/server_test.go
index 48c9726e3bee6ff8acb56a1a02192963b76556a3..c37852a128bbaa9571ebf1527f3f9f6b6cee41ae 100644
(file)
--- a/
services/keep-web/server_test.go
+++ b/
services/keep-web/server_test.go
@@
-5,6
+5,7
@@
package main
import (
package main
import (
+ "bytes"
"crypto/md5"
"encoding/json"
"fmt"
"crypto/md5"
"encoding/json"
"fmt"
@@
-17,10
+18,12
@@
import (
"strings"
"testing"
"strings"
"testing"
- "git.curoverse.com/arvados.git/sdk/go/arvados"
- "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
- "git.curoverse.com/arvados.git/sdk/go/arvadostest"
- "git.curoverse.com/arvados.git/sdk/go/keepclient"
+ "git.arvados.org/arvados.git/lib/config"
+ "git.arvados.org/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/sdk/go/arvadosclient"
+ "git.arvados.org/arvados.git/sdk/go/arvadostest"
+ "git.arvados.org/arvados.git/sdk/go/ctxlog"
+ "git.arvados.org/arvados.git/sdk/go/keepclient"
check "gopkg.in/check.v1"
)
check "gopkg.in/check.v1"
)
@@
-148,7
+151,7
@@
type curlCase struct {
}
func (s *IntegrationSuite) Test200(c *check.C) {
}
func (s *IntegrationSuite) Test200(c *check.C) {
- s.testServer.Config.
AnonymousTokens = []string{arvadostest.AnonymousToken}
+ s.testServer.Config.
cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
for _, spec := range []curlCase{
// My collection
{
for _, spec := range []curlCase{
// My collection
{
@@
-164,16
+167,16
@@
func (s *IntegrationSuite) Test200(c *check.C) {
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
- host: strings.Replace(arvadostest.Foo
Pdh
, "+", "-", 1) + ".collections.example.com",
+ host: strings.Replace(arvadostest.Foo
CollectionPDH
, "+", "-", 1) + ".collections.example.com",
path: "/t=" + arvadostest.ActiveToken + "/foo",
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
path: "/t=" + arvadostest.ActiveToken + "/foo",
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
- path: "/c=" + arvadostest.Foo
Pdh
+ "/t=" + arvadostest.ActiveToken + "/foo",
+ path: "/c=" + arvadostest.Foo
CollectionPDH
+ "/t=" + arvadostest.ActiveToken + "/foo",
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
- path: "/c=" + strings.Replace(arvadostest.Foo
Pdh
, "+", "-", 1) + "/t=" + arvadostest.ActiveToken + "/_/foo",
+ path: "/c=" + strings.Replace(arvadostest.Foo
CollectionPDH
, "+", "-", 1) + "/t=" + arvadostest.ActiveToken + "/_/foo",
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
dataMD5: "acbd18db4cc2f85cedef654fccc4a4d8",
},
{
@@
-266,9
+269,10
@@
func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ...
c.Log(fmt.Sprintf("curlArgs == %#v", curlArgs))
cmd := exec.Command("curl", curlArgs...)
stdout, err := cmd.StdoutPipe()
c.Log(fmt.Sprintf("curlArgs == %#v", curlArgs))
cmd := exec.Command("curl", curlArgs...)
stdout, err := cmd.StdoutPipe()
- c.Assert(err, check.Equals, nil)
- cmd.Stderr = cmd.Stdout
- go cmd.Start()
+ c.Assert(err, check.IsNil)
+ cmd.Stderr = os.Stderr
+ err = cmd.Start()
+ c.Assert(err, check.IsNil)
buf := make([]byte, 2<<27)
n, err := io.ReadFull(stdout, buf)
// Discard (but measure size of) anything past 128 MiB.
buf := make([]byte, 2<<27)
n, err := io.ReadFull(stdout, buf)
// Discard (but measure size of) anything past 128 MiB.
@@
-276,9
+280,9
@@
func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ...
if err == io.ErrUnexpectedEOF {
buf = buf[:n]
} else {
if err == io.ErrUnexpectedEOF {
buf = buf[:n]
} else {
- c.Assert(err, check.
Equals, n
il)
+ c.Assert(err, check.
IsN
il)
discarded, err = io.Copy(ioutil.Discard, stdout)
discarded, err = io.Copy(ioutil.Discard, stdout)
- c.Assert(err, check.
Equals, n
il)
+ c.Assert(err, check.
IsN
il)
}
err = cmd.Wait()
// Without "-f", curl exits 0 as long as it gets a valid HTTP
}
err = cmd.Wait()
// Without "-f", curl exits 0 as long as it gets a valid HTTP
@@
-297,6
+301,7
@@
func (s *IntegrationSuite) runCurl(c *check.C, token, host, uri string, args ...
}
func (s *IntegrationSuite) TestMetrics(c *check.C) {
}
func (s *IntegrationSuite) TestMetrics(c *check.C) {
+ s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = s.testServer.Addr
origin := "http://" + s.testServer.Addr
req, _ := http.NewRequest("GET", origin+"/notfound", nil)
_, err := http.DefaultClient.Do(req)
origin := "http://" + s.testServer.Addr
req, _ := http.NewRequest("GET", origin+"/notfound", nil)
_, err := http.DefaultClient.Do(req)
@@
-337,12
+342,8
@@
func (s *IntegrationSuite) TestMetrics(c *check.C) {
c.Assert(err, check.IsNil)
c.Check(resp.StatusCode, check.Equals, http.StatusOK)
type summary struct {
c.Assert(err, check.IsNil)
c.Check(resp.StatusCode, check.Equals, http.StatusOK)
type summary struct {
- SampleCount string `json:"sample_count"`
- SampleSum float64 `json:"sample_sum"`
- Quantile []struct {
- Quantile float64
- Value float64
- }
+ SampleCount string
+ SampleSum float64
}
type counter struct {
Value int64
}
type counter struct {
Value int64
@@
-415,6
+416,7
@@
func (s *IntegrationSuite) SetUpSuite(c *check.C) {
kc.PutB([]byte("Hello world\n"))
kc.PutB([]byte("foo"))
kc.PutB([]byte("foobar"))
kc.PutB([]byte("Hello world\n"))
kc.PutB([]byte("foo"))
kc.PutB([]byte("foobar"))
+ kc.PutB([]byte("waz"))
}
func (s *IntegrationSuite) TearDownSuite(c *check.C) {
}
func (s *IntegrationSuite) TearDownSuite(c *check.C) {
@@
-424,15
+426,23
@@
func (s *IntegrationSuite) TearDownSuite(c *check.C) {
func (s *IntegrationSuite) SetUpTest(c *check.C) {
arvadostest.ResetEnv()
func (s *IntegrationSuite) SetUpTest(c *check.C) {
arvadostest.ResetEnv()
- cfg := DefaultConfig()
+ ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), ctxlog.TestLogger(c))
+ ldr.Path = "-"
+ arvCfg, err := ldr.Load()
+ c.Check(err, check.IsNil)
+ cfg := newConfig(arvCfg)
+ c.Assert(err, check.IsNil)
cfg.Client = arvados.Client{
APIHost: testAPIHost,
Insecure: true,
}
cfg.Client = arvados.Client{
APIHost: testAPIHost,
Insecure: true,
}
- cfg.Listen = "127.0.0.1:0"
- cfg.ManagementToken = arvadostest.ManagementToken
+ listen := "127.0.0.1:0"
+ 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}
s.testServer = &server{Config: cfg}
- err
:= s.testServer.Start(
)
+ err
= s.testServer.Start(ctxlog.TestLogger(c)
)
c.Assert(err, check.Equals, nil)
}
c.Assert(err, check.Equals, nil)
}