X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dcb7f718a7bf31c6e1227d28cdaac64fa769015b..9acc8cb9cd9ca4429712b0d31b647e9a6ecf2d96:/services/keep-web/ranges_test.go

diff --git a/services/keep-web/ranges_test.go b/services/keep-web/ranges_test.go
index 5dfe02fcfa..8e7dbadc4e 100644
--- a/services/keep-web/ranges_test.go
+++ b/services/keep-web/ranges_test.go
@@ -1,13 +1,17 @@
-package main
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package keepweb
 
 import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
 
-	"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/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/keepclient"
 	check "gopkg.in/check.v1"
 )
 
@@ -19,7 +23,7 @@ func (s *IntegrationSuite) TestRanges(c *check.C) {
 		for i := 0; i < blocksize; i++ {
 			testdata[i] = byte(' ')
 		}
-		copy(testdata[:3], []byte("foo"))
+		copy(testdata[1:4], []byte("foo"))
 		arv, err := arvadosclient.MakeArvadosClient()
 		c.Assert(err, check.Equals, nil)
 		arv.ApiToken = arvadostest.ActiveToken
@@ -27,12 +31,10 @@ func (s *IntegrationSuite) TestRanges(c *check.C) {
 		c.Assert(err, check.Equals, nil)
 		loc, _, err := kc.PutB(testdata[:])
 		c.Assert(err, check.Equals, nil)
+		loc2, _, err := kc.PutB([]byte{'Z'})
+		c.Assert(err, check.Equals, nil)
 
-		mtext := "."
-		for i := 0; i < 4; i++ {
-			mtext = mtext + " " + loc
-		}
-		mtext = mtext + fmt.Sprintf(" 0:%d:testdata.bin\n", blocksize*4)
+		mtext := fmt.Sprintf(". %s %s %s %s %s 1:%d:testdata.bin 0:1:space.txt\n", loc, loc, loc, loc, loc2, blocksize*4)
 		coll := map[string]interface{}{}
 		err = arv.Create("collections",
 			map[string]interface{}{
@@ -53,17 +55,18 @@ func (s *IntegrationSuite) TestRanges(c *check.C) {
 		expectBody string
 	}{
 		{"0-2", true, "foo"},
+		{"-2", true, " Z"},
 		{"1-4", true, "oo  "},
 		{"z-y", false, ""},
 		{"1000000-1000003", true, "foo "},
 		{"999999-1000003", true, " foo "},
 		{"2000000-2000003", true, "foo "},
 		{"1999999-2000002", true, " foo"},
-		{"3999998-3999999", true, "  "},
-		{"3999998-4000004", true, "  "},
-		{"3999998-", true, "  "},
+		{"3999998-3999999", true, " Z"},
+		{"3999998-4000004", true, " Z"},
+		{"3999998-", true, " Z"},
 	} {
-		c.Logf("%+v", trial)
+		c.Logf("trial: %#v", trial)
 		resp := httptest.NewRecorder()
 		req := &http.Request{
 			Method:     "GET",
@@ -75,14 +78,17 @@ func (s *IntegrationSuite) TestRanges(c *check.C) {
 				"Range":         {"bytes=" + trial.header},
 			},
 		}
-		s.testServer.Handler.ServeHTTP(resp, req)
+		s.handler.ServeHTTP(resp, req)
 		if trial.expectObey {
 			c.Check(resp.Code, check.Equals, http.StatusPartialContent)
 			c.Check(resp.Body.Len(), check.Equals, len(trial.expectBody))
-			c.Check(resp.Body.String()[:len(trial.expectBody)], check.Equals, trial.expectBody)
+			if resp.Body.Len() > 1000 {
+				c.Check(resp.Body.String()[:1000]+"[...]", check.Equals, trial.expectBody)
+			} else {
+				c.Check(resp.Body.String(), check.Equals, trial.expectBody)
+			}
 		} else {
-			c.Check(resp.Code, check.Equals, http.StatusOK)
-			c.Check(resp.Body.Len(), check.Equals, blocksize*4)
+			c.Check(resp.Code, check.Equals, http.StatusRequestedRangeNotSatisfiable)
 		}
 	}
 }