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

« back to all changes in this revision

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

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
1169
1169
        env := t.Prepare(c)
1170
1170
        validator, err := env.ConstraintsValidator()
1171
1171
        c.Assert(err, jc.ErrorIsNil)
1172
 
        consA := constraints.MustParse("arch=amd64 mem=1G cpu-power=10 cpu-cores=2 tags=bar")
 
1172
        consA := constraints.MustParse("arch=amd64 mem=1G cpu-power=10 cores=2 tags=bar")
1173
1173
        consB := constraints.MustParse("arch=i386 instance-type=m1.small")
1174
1174
        cons, err := validator.Merge(consA, consB)
1175
1175
        c.Assert(err, jc.ErrorIsNil)