Reset listener=nil before running main() from test cases, so

[arvados.git] / services / keepproxy / keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 667a0b20a626e8fca138e8822a8fac79eaf0e44d..11dd206fa8087d9f3722629d5ee2bc7640fbb625 100644 (file)
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -138,6 +138,7 @@ func runProxy(c *C, args []string, token string, port int) keepclient.KeepClient
        os.Args = append(args, fmt.Sprintf("-listen=:%v", port))
        os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
 
+       listener = nil
        go main()
        time.Sleep(100 * time.Millisecond)
 
@@ -162,6 +163,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 
        os.Args = []string{"keepproxy", "-listen=:29950"}
        os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
+       listener = nil
        go main()
        time.Sleep(100 * time.Millisecond)
 
@@ -349,7 +351,7 @@ func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
                        fmt.Sprintf("http://localhost:29954/%x+3",
                                md5.Sum([]byte("foo"))))
                c.Check(err, Equals, nil)
-               c.Check(resp.Header.Get("Access-Control-Allow-Headers"), Equals, "Authorization")
+               c.Check(resp.Header.Get("Access-Control-Allow-Headers"), Equals, "Authorization, Content-Length, Content-Type, X-Keep-Desired-Replicas")
                c.Check(resp.Header.Get("Access-Control-Allow-Origin"), Equals, "*")
        }
 }