cmd/jujud: do not change password

environs/instances/image_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package instances
 
 import (
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/environs/imagemetadata"
         coretesting "launchpad.net/juju-core/testing"
@@ skipping 144 matching lines @@
 
 var pv = "pv"
 var findInstanceSpecTests = []instanceSpecTestParams{
         {
                 desc:    "image exists in metadata",
                 region:  "test",
                 imageId: "ami-00000033",
                 instanceTypes: []InstanceType{
                         {Id: "1", Name: "it-1", Arches: []string{"amd64"}, VType: &pv, Mem: 512},
                 },
-                instanceTypeId:   "1",
-                instanceTypeName: "it-1",
         },
         {
                 desc:    "multiple images exists in metadata, use most recent",
                 region:  "test",
                 imageId: "ami-00000035",
                 instanceTypes: []InstanceType{
-                        {Id: "1", Name: "it-1", Arches: []string{"amd64"}, VType: &hvm, Mem: 512},
+                        {Id: "1", Name: "it-1", Arches: []string{"amd64"}, VType: &hvm, Mem: 512, CpuCores: 2},
                 },
-                instanceTypeId:   "1",
-                instanceTypeName: "it-1",
         },
         {
                 desc:   "no image exists in metadata",
                 region: "invalid-region",
                 err:    `no "precise" images in invalid-region with arches \[amd64 arm\]`,
         },
         {
                 desc:          "no valid instance types",
                 region:        "test",
                 instanceTypes: []InstanceType{},
@@ skipping 34 matching lines @@
                         Constraints: constraints.MustParse(t.constraints),
                 }, t.instanceTypes)
                 if t.err != "" {
                         c.Check(err, ErrorMatches, t.err)
                         continue
                 }
                 if !c.Check(err, IsNil) {
                         continue
                 }
                 c.Check(spec.Image.Id, Equals, t.imageId)
-                c.Check(spec.InstanceTypeId, Equals, t.instanceTypeId)
-                c.Check(spec.InstanceTypeName, Equals, t.instanceTypeName)
+                if len(t.instanceTypes) == 1 {
+                        c.Check(spec.InstanceType, DeepEquals, t.instanceTypes[0])
+                }
         }
 }
 
 var imageMatchtests = []struct {
         image Image
         itype InstanceType
         match bool
 }{
         {
                 image: Image{Arch: "amd64"},
@@ skipping 19 matching lines @@
                 itype: InstanceType{Arches: []string{"amd64"}, VType: &hvm},
         },
 }
 
 func (s *imageSuite) TestImageMatch(c *C) {
         for i, t := range imageMatchtests {
                 c.Logf("test %d", i)
                 c.Check(t.image.match(t.itype), Equals, t.match)
         }
 }