6377: Fix crash if no asset pipeline.

[arvados.git] / services / keepstore / handler_test.go

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 5c367ae916cb148bbf18f6f5c652df68acab2dce..c181982a132cb7490d03451c891d78c5e56eaa33 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -195,7 +195,7 @@ func TestPutHandler(t *testing.T) {
                "Authenticated PUT, signed locator, with server key",
                http.StatusOK, response)
        response_locator := strings.TrimSpace(response.Body.String())
-       if !VerifySignature(response_locator, known_token) {
+       if VerifySignature(response_locator, known_token) != nil {
                t.Errorf("Authenticated PUT, signed locator, with server key:\n"+
                        "response '%s' does not contain a valid signature",
                        response_locator)
@@ -377,7 +377,7 @@ func TestIndexHandler(t *testing.T) {
                response)
 
        expected := `^` + TEST_HASH + `\+\d+ \d+\n` +
-               TEST_HASH_2 + `\+\d+ \d+\n$`
+               TEST_HASH_2 + `\+\d+ \d+\n\n$`
        match, _ := regexp.MatchString(expected, response.Body.String())
        if !match {
                t.Errorf(
@@ -393,7 +393,7 @@ func TestIndexHandler(t *testing.T) {
                http.StatusOK,
                response)
 
-       expected = `^` + TEST_HASH + `\+\d+ \d+\n$`
+       expected = `^` + TEST_HASH + `\+\d+ \d+\n\n$`
        match, _ = regexp.MatchString(expected, response.Body.String())
        if !match {
                t.Errorf(
@@ -788,7 +788,7 @@ func ExpectStatusCode(
        expected_status int,
        response *httptest.ResponseRecorder) {
        if response.Code != expected_status {
-               t.Errorf("%s: expected status %s, got %+v",
+               t.Errorf("%s: expected status %d, got %+v",
                        testname, expected_status, response)
        }
 }
@@ -821,10 +821,10 @@ func TestPutHandlerNoBufferleak(t *testing.T) {
                        unsigned_locator := "/" + TEST_HASH
                        response := IssueRequest(
                                &RequestTester{
-                               method:       "PUT",
-                               uri:          unsigned_locator,
-                               request_body: TEST_BLOCK,
-                       })
+                                       method:       "PUT",
+                                       uri:          unsigned_locator,
+                                       request_body: TEST_BLOCK,
+                               })
                        ExpectStatusCode(t,
                                "TestPutHandlerBufferleak", http.StatusOK, response)
                        ExpectBody(t,
@@ -834,7 +834,7 @@ func TestPutHandlerNoBufferleak(t *testing.T) {
                ok <- true
        }()
        select {
-       case <-time.After(20*time.Second):
+       case <-time.After(20 * time.Second):
                // If the buffer pool leaks, the test goroutine hangs.
                t.Fatal("test did not finish, assuming pool leaked")
        case <-ok:
@@ -863,9 +863,9 @@ func TestGetHandlerNoBufferleak(t *testing.T) {
                        unsigned_locator := "/" + TEST_HASH
                        response := IssueRequest(
                                &RequestTester{
-                               method: "GET",
-                               uri:    unsigned_locator,
-                       })
+                                       method: "GET",
+                                       uri:    unsigned_locator,
+                               })
                        ExpectStatusCode(t,
                                "Unauthenticated request, unsigned locator", http.StatusOK, response)
                        ExpectBody(t,
@@ -876,7 +876,7 @@ func TestGetHandlerNoBufferleak(t *testing.T) {
                ok <- true
        }()
        select {
-       case <-time.After(20*time.Second):
+       case <-time.After(20 * time.Second):
                // If the buffer pool leaks, the test goroutine hangs.
                t.Fatal("test did not finish, assuming pool leaked")
        case <-ok: