~ubuntu-branches/ubuntu/vivid/juju-core/vivid-proposed

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/ec2/environ_test.go

  • Committer: Package Import Robot
  • Author(s): Curtis C. Hovey
  • Date: 2015-09-29 19:43:29 UTC
  • mfrom: (47.1.4 wily-proposed)
  • Revision ID: package-import@ubuntu.com-20150929194329-9y496tbic30hc7vp
Tags: 1.24.6-0ubuntu1~15.04.1
Backport of 1.24.6 from wily. (LP: #1500916, #1497087)

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
 
6
6
import (
7
7
        jc "github.com/juju/testing/checkers"
 
8
        amzec2 "gopkg.in/amz.v3/ec2"
8
9
        gc "gopkg.in/check.v1"
9
 
        amzec2 "launchpad.net/goamz/ec2"
10
10
 
11
11
        "github.com/juju/juju/constraints"
12
 
        "github.com/juju/juju/environs"
13
12
        "github.com/juju/juju/network"
14
13
)
15
14
 
68
67
func (*Suite) TestRootDiskBlockDeviceMapping(c *gc.C) {
69
68
        for _, t := range rootDiskTests {
70
69
                c.Logf("Test %s", t.name)
71
 
                args := &environs.StartInstanceParams{
72
 
                        Constraints: constraints.Value{RootDisk: t.constraint},
73
 
                }
74
 
                mappings, _, err := getBlockDeviceMappings(paravirtual, args)
 
70
                cons := constraints.Value{RootDisk: t.constraint}
 
71
                mappings, err := getBlockDeviceMappings(cons)
75
72
                c.Assert(err, jc.ErrorIsNil)
76
73
                expected := append([]amzec2.BlockDeviceMapping{t.device}, commonInstanceStoreDisks...)
77
74
                c.Assert(mappings, gc.DeepEquals, expected)