7931: Merge branch 'master' into 7931-replicas-by-volume

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

diff --git a/services/keepstore/mounts_test.go b/services/keepstore/mounts_test.go
index 883aa712e3db0bdcb8fee2eb0a583affd3150e53..0f7b6e97351a1a6049cb1ef49db69dcb1f29a6d7 100644 (file)
--- a/services/keepstore/mounts_test.go
+++ b/services/keepstore/mounts_test.go
@@ -46,11 +46,11 @@ func (s *MountsSuite) TestMounts(c *check.C) {
        resp := s.call("GET", "/mounts", "", nil)
        c.Check(resp.Code, check.Equals, http.StatusOK)
        var mntList []struct {
-               UUID        string
-               DeviceID    string
-               ReadOnly    bool
-               Replication int
-               Tier        int
+               UUID           string   `json:"uuid"`
+               DeviceID       string   `json:"device_id"`
+               ReadOnly       bool     `json:"read_only"`
+               Replication    int      `json:"replication"`
+               StorageClasses []string `json:"storage_classes"`
        }
        err := json.Unmarshal(resp.Body.Bytes(), &mntList)
        c.Assert(err, check.IsNil)
@@ -61,7 +61,7 @@ func (s *MountsSuite) TestMounts(c *check.C) {
                c.Check(m.DeviceID, check.Equals, "mock-device-id")
                c.Check(m.ReadOnly, check.Equals, false)
                c.Check(m.Replication, check.Equals, 1)
-               c.Check(m.Tier, check.Equals, 1)
+               c.Check(m.StorageClasses, check.DeepEquals, []string{"default"})
        }
        c.Check(mntList[0].UUID, check.Not(check.Equals), mntList[1].UUID)