2960: Refactor keepstore into a streaming server.

[arvados.git] / services / keep-balance / change_set_test.go

diff --git a/services/keep-balance/change_set_test.go b/services/keep-balance/change_set_test.go
index 5eb850d6a99aa3f736a2968a8bbb9db72aaaa20c..f2b9429017cf52a4b21398a4d8106b70a3e34757 100644 (file)
--- a/services/keep-balance/change_set_test.go
+++ b/services/keep-balance/change_set_test.go
@@ -2,12 +2,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepbalance
 
 import (
        "encoding/json"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
 
        check "gopkg.in/check.v1"
 )
@@ -17,6 +17,9 @@ var _ = check.Suite(&changeSetSuite{})
 type changeSetSuite struct{}
 
 func (s *changeSetSuite) TestJSONFormat(c *check.C) {
+       mnt := &KeepMount{
+               KeepMount: arvados.KeepMount{
+                       UUID: "zzzzz-mount-abcdefghijklmno"}}
        srv := &KeepService{
                KeepService: arvados.KeepService{
                        UUID:           "zzzzz-bi6l4-000000000000001",
@@ -27,13 +30,15 @@ func (s *changeSetSuite) TestJSONFormat(c *check.C) {
 
        buf, err := json.Marshal([]Pull{{
                SizedDigest: arvados.SizedDigest("acbd18db4cc2f85cedef654fccc4a4d8+3"),
-               Source:      srv}})
+               To:          mnt,
+               From:        srv}})
        c.Check(err, check.IsNil)
-       c.Check(string(buf), check.Equals, `[{"locator":"acbd18db4cc2f85cedef654fccc4a4d8","servers":["http://keep1.zzzzz.arvadosapi.com:25107"]}]`)
+       c.Check(string(buf), check.Equals, `[{"locator":"acbd18db4cc2f85cedef654fccc4a4d8+3","servers":["http://keep1.zzzzz.arvadosapi.com:25107"],"mount_uuid":"zzzzz-mount-abcdefghijklmno"}]`)
 
        buf, err = json.Marshal([]Trash{{
                SizedDigest: arvados.SizedDigest("acbd18db4cc2f85cedef654fccc4a4d8+3"),
+               From:        mnt,
                Mtime:       123456789}})
        c.Check(err, check.IsNil)
-       c.Check(string(buf), check.Equals, `[{"locator":"acbd18db4cc2f85cedef654fccc4a4d8","block_mtime":123456789}]`)
+       c.Check(string(buf), check.Equals, `[{"locator":"acbd18db4cc2f85cedef654fccc4a4d8+3","block_mtime":123456789,"mount_uuid":"zzzzz-mount-abcdefghijklmno"}]`)
 }