← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/storage/volumelist_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/apiserver/storage/volumelist_test.go
13
13
 
14
14
        "github.com/juju/juju/apiserver/params"
15
15
        "github.com/juju/juju/state"
 
16
        "github.com/juju/juju/status"
16
17
)
17
18
 
18
19
type volumeSuite struct {
150
151
        }
151
152
        expected := s.expectedVolumeDetails()
152
153
        expected.Storage.Kind = params.StorageKindBlock
153
 
        expected.Storage.Status.Status = params.StatusAttached
 
154
        expected.Storage.Status.Status = status.StatusAttached
154
155
        expected.MachineAttachments[s.machineTag.String()] = params.VolumeAttachmentInfo{
155
156
                ReadOnly: true,
156
157
        }
176
177
        }
177
178
        expected := s.expectedVolumeDetails()
178
179
        expected.Storage.Kind = params.StorageKindBlock
179
 
        expected.Storage.Status.Status = params.StatusAttached
 
180
        expected.Storage.Status.Status = status.StatusAttached
180
181
        storageAttachmentDetails := expected.Storage.Attachments["unit-mysql-0"]
181
182
        storageAttachmentDetails.Location = filepath.FromSlash("/dev/sdd")
182
183
        expected.Storage.Attachments["unit-mysql-0"] = storageAttachmentDetails