X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/39e38f830e8a12c93d5a788d15a5834b6f911217..ce5813a53eda0f1d1512f6c080e6c4ed95179089:/sdk/go/src/arvados.org/keepclient/keepclient_test.go

diff --git a/sdk/go/src/arvados.org/keepclient/keepclient_test.go b/sdk/go/src/arvados.org/keepclient/keepclient_test.go
index 291d8f896c..8eedadd64b 100644
--- a/sdk/go/src/arvados.org/keepclient/keepclient_test.go
+++ b/sdk/go/src/arvados.org/keepclient/keepclient_test.go
@@ -163,7 +163,7 @@ func (s *StandaloneSuite) TestUploadToStubKeepServer(c *C) {
 
 			<-st.handled
 			status := <-upload_status
-			c.Check(status, DeepEquals, uploadStatus{nil, fmt.Sprintf("%s/%s", url, st.expectPath), 200, 1})
+			c.Check(status, DeepEquals, uploadStatus{nil, fmt.Sprintf("%s/%s", url, st.expectPath), 200, 1, ""})
 		})
 
 	log.Printf("TestUploadToStubKeepServer done")
@@ -196,7 +196,7 @@ func (s *StandaloneSuite) TestUploadToStubKeepServerBufferReader(c *C) {
 			<-st.handled
 
 			status := <-upload_status
-			c.Check(status, DeepEquals, uploadStatus{nil, fmt.Sprintf("%s/%s", url, st.expectPath), 200, 1})
+			c.Check(status, DeepEquals, uploadStatus{nil, fmt.Sprintf("%s/%s", url, st.expectPath), 200, 1, ""})
 		})
 
 	log.Printf("TestUploadToStubKeepServerBufferReader done")
@@ -386,7 +386,7 @@ func (s *StandaloneSuite) TestPutWithFail(c *C) {
 	<-fh.handled
 
 	c.Check(err, Equals, nil)
-	c.Check(phash, Equals, hash)
+	c.Check(phash, Equals, "")
 	c.Check(replicas, Equals, 2)
 	c.Check(<-st.handled, Equals, shuff[1])
 	c.Check(<-st.handled, Equals, shuff[2])
@@ -598,7 +598,7 @@ func (s *ServerRequiredSuite) TestPutGetHead(c *C) {
 	}
 	{
 		hash2, replicas, err := kc.PutB([]byte("foo"))
-		c.Check(hash2, Equals, hash)
+		c.Check(hash2, Equals, fmt.Sprintf("%s+%v", hash, 3))
 		c.Check(replicas, Equals, 2)
 		c.Check(err, Equals, nil)
 	}
@@ -687,3 +687,12 @@ func (s *StandaloneSuite) TestPutProxyInsufficientReplicas(c *C) {
 
 	log.Printf("TestPutProxy done")
 }
+
+func (s *StandaloneSuite) TestMakeLocator(c *C) {
+	l := MakeLocator("91f372a266fe2bf2823cb8ec7fda31ce+3+Aabcde@12345678")
+
+	c.Check(l.Hash, Equals, "91f372a266fe2bf2823cb8ec7fda31ce")
+	c.Check(l.Size, Equals, 3)
+	c.Check(l.Signature, Equals, "abcde")
+	c.Check(l.Timestamp, Equals, "12345678")
+}