18947: Update test to new log fields. Add back "locator" log field.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index eaa64b0ed2bf4dcf38a10ac2490de7de051709ab..f857ed3e4ebf4859e1355260ce85bc52fa50de90 100644 (file)
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -295,6 +295,7 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
        logger := ctxlog.FromContext(req.Context())
        defer func() {
                httpserver.SetResponseLogFields(req.Context(), logrus.Fields{
        logger := ctxlog.FromContext(req.Context())
        defer func() {
                httpserver.SetResponseLogFields(req.Context(), logrus.Fields{

+                       "locator":        locator,

                        "expectLength":   expectLength,
                        "responseLength": responseLength,
                        "proxiedURI":     proxiedURI,
                        "expectLength":   expectLength,
                        "responseLength": responseLength,
                        "proxiedURI":     proxiedURI,

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 12d65201dafd4503699a63802d37b6ff0b662c13..8242f5b2b56868b23dfaecf4aefe814100e682ee 100644 (file)
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -370,7 +370,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
                c.Check(err, Equals, nil)
                c.Log("Finished PutB (expected success)")
 
                c.Check(err, Equals, nil)
                c.Log("Finished PutB (expected success)")
 

-               c.Check(logbuf.String(), Matches, `(?ms).*msg="Block upload".* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* user_full_name="TestCase Administrator".* user_uuid=zzzzz-tpzed-d9tiejq69daie8f.*`)
+               c.Check(logbuf.String(), Matches, `(?ms).* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* userFullName="TestCase Administrator".* userUUID=zzzzz-tpzed-d9tiejq69daie8f.*`)

                logbuf.Reset()
        }
 
                logbuf.Reset()
        }
 


@@ -379,7 +379,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
                c.Assert(err, Equals, nil)
                c.Check(blocklen, Equals, int64(3))
                c.Log("Finished Ask (expected success)")
                c.Assert(err, Equals, nil)
                c.Check(blocklen, Equals, int64(3))
                c.Log("Finished Ask (expected success)")

-               c.Check(logbuf.String(), Matches, `(?ms).*msg="Block download".* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* user_full_name="TestCase Administrator".* user_uuid=zzzzz-tpzed-d9tiejq69daie8f.*`)
+               c.Check(logbuf.String(), Matches, `(?ms).* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* userFullName="TestCase Administrator".* userUUID=zzzzz-tpzed-d9tiejq69daie8f.*`)

                logbuf.Reset()
        }
 
                logbuf.Reset()
        }
 


@@ -391,7 +391,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
                c.Check(all, DeepEquals, []byte("foo"))
                c.Check(blocklen, Equals, int64(3))
                c.Log("Finished Get (expected success)")
                c.Check(all, DeepEquals, []byte("foo"))
                c.Check(blocklen, Equals, int64(3))
                c.Log("Finished Get (expected success)")

-               c.Check(logbuf.String(), Matches, `(?ms).*msg="Block download".* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* user_full_name="TestCase Administrator".* user_uuid=zzzzz-tpzed-d9tiejq69daie8f.*`)
+               c.Check(logbuf.String(), Matches, `(?ms).* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* userFullName="TestCase Administrator".* userUUID=zzzzz-tpzed-d9tiejq69daie8f.*`)

                logbuf.Reset()
        }
 
                logbuf.Reset()
        }
 


@@ -473,10 +473,10 @@ func testPermission(c *C, admin bool, perm arvados.UploadDownloadPermission) {
                        c.Check(err, Equals, nil)
                        c.Log("Finished PutB (expected success)")
                        if admin {
                        c.Check(err, Equals, nil)
                        c.Log("Finished PutB (expected success)")
                        if admin {

-                               c.Check(logbuf.String(), Matches, `(?ms).*msg="Block upload".* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* user_full_name="TestCase Administrator".* user_uuid=zzzzz-tpzed-d9tiejq69daie8f.*`)
+                               c.Check(logbuf.String(), Matches, `(?ms).* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* userFullName="TestCase Administrator".* userUUID=zzzzz-tpzed-d9tiejq69daie8f.*`)

                        } else {
 
                        } else {
 

-                               c.Check(logbuf.String(), Matches, `(?ms).*msg="Block upload".* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* user_full_name="Active User".* user_uuid=zzzzz-tpzed-xurymjxw79nv3jz.*`)
+                               c.Check(logbuf.String(), Matches, `(?ms).* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* userFullName="Active User".* userUUID=zzzzz-tpzed-xurymjxw79nv3jz.*`)

                        }
                } else {
                        c.Check(hash2, Equals, "")
                        }
                } else {
                        c.Check(hash2, Equals, "")


@@ -497,9 +497,9 @@ func testPermission(c *C, admin bool, perm arvados.UploadDownloadPermission) {
                        c.Check(blocklen, Equals, int64(3))
                        c.Log("Finished Get (expected success)")
                        if admin {
                        c.Check(blocklen, Equals, int64(3))
                        c.Log("Finished Get (expected success)")
                        if admin {

-                               c.Check(logbuf.String(), Matches, `(?ms).*msg="Block download".* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* user_full_name="TestCase Administrator".* user_uuid=zzzzz-tpzed-d9tiejq69daie8f.*`)
+                               c.Check(logbuf.String(), Matches, `(?ms).* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* userFullName="TestCase Administrator".* userUUID=zzzzz-tpzed-d9tiejq69daie8f.*`)

                        } else {
                        } else {

-                               c.Check(logbuf.String(), Matches, `(?ms).*msg="Block download".* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* user_full_name="Active User".* user_uuid=zzzzz-tpzed-xurymjxw79nv3jz.*`)
+                               c.Check(logbuf.String(), Matches, `(?ms).* locator=acbd18db4cc2f85cedef654fccc4a4d8\+3.* userFullName="Active User".* userUUID=zzzzz-tpzed-xurymjxw79nv3jz.*`)

                        }
                } else {
                        c.Check(err, FitsTypeOf, &keepclient.ErrNotFound{})
                        }
                } else {
                        c.Check(err, FitsTypeOf, &keepclient.ErrNotFound{})