11644: Test fields in /mounts response.

diff --git a/services/keepstore/mounts_test.go b/services/keepstore/mounts_test.go
index bfe298b67bfdbf7a8adb83c9f4baaeea71508be5..b44a08f840412074e3aae674bbf9865705f64778 100644 (file)
--- a/services/keepstore/mounts_test.go
+++ b/services/keepstore/mounts_test.go
@@ -39,11 +39,24 @@ func (s *MountsSuite) TestMounts(c *check.C) {
        resp := s.call("GET", "/mounts", "")
        c.Check(resp.Code, check.Equals, http.StatusOK)
        var mntList []struct {
-               UUID string
+               UUID        string
+               DeviceID    string
+               ReadOnly    bool
+               Replication int
+               Tier        int
        }
        err := json.Unmarshal(resp.Body.Bytes(), &mntList)
-       c.Check(err, check.IsNil)
-       c.Check(len(mntList), check.Equals, 2)
+       c.Assert(err, check.IsNil)
+       c.Assert(len(mntList), check.Equals, 2)
+       for _, m := range mntList {
+               c.Check(len(m.UUID), check.Equals, 27)
+               c.Check(m.UUID[:12], check.Equals, "zzzzz-ivpuk-")
+               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(mntList[0].UUID, check.Not(check.Equals), mntList[1].UUID)
 
        // Bad auth
        for _, tok := range []string{"", "xyzzy"} {

diff --git a/services/keepstore/volume_test.go b/services/keepstore/volume_test.go
index 931c10e69044c4715eb35ccab4d33872a848db5d..58934813fa46d57481c53133879d938bbac2d352 100644 (file)
--- a/services/keepstore/volume_test.go
+++ b/services/keepstore/volume_test.go
@@ -199,6 +199,10 @@ func (v *MockVolume) Trash(loc string) error {
        return os.ErrNotExist
 }
 
+func (v *MockVolume) DeviceID() string {
+       return "mock-device-id"
+}
+
 func (v *MockVolume) Type() string {
        return "Mock"
 }