← 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/worker/provisioner/kvm-broker_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/worker/provisioner/kvm-broker_test.go
16
16
        gitjujutesting "github.com/juju/testing"
17
17
        jc "github.com/juju/testing/checkers"
18
18
        "github.com/juju/utils/arch"
 
19
        "github.com/juju/version"
19
20
        gc "gopkg.in/check.v1"
20
21
 
21
22
        "github.com/juju/juju/agent"
31
32
        jujutesting "github.com/juju/juju/juju/testing"
32
33
        "github.com/juju/juju/network"
33
34
        "github.com/juju/juju/state"
 
35
        "github.com/juju/juju/status"
34
36
        coretesting "github.com/juju/juju/testing"
35
37
        coretools "github.com/juju/juju/tools"
36
 
        "github.com/juju/juju/version"
 
38
        jujuversion "github.com/juju/juju/version"
37
39
        "github.com/juju/juju/worker/provisioner"
38
40
)
39
41
 
84
86
                agent.AgentConfigParams{
85
87
                        Paths:             agent.NewPathsWithDefaults(agent.Paths{DataDir: "/not/used/here"}),
86
88
                        Tag:               names.NewUnitTag("ubuntu/1"),
87
 
                        UpgradedToVersion: version.Current,
 
89
                        UpgradedToVersion: jujuversion.Current,
88
90
                        Password:          "dummy-secret",
89
91
                        Nonce:             "nonce",
90
92
                        APIAddresses:      []string{"10.0.0.1:1234"},
116
118
                Version: version.MustParseBinary("2.3.4-quantal-amd64"),
117
119
                URL:     "http://tools.testing.invalid/2.3.4-quantal-amd64.tgz",
118
120
        }}
 
121
        callback := func(settableStatus status.Status, info string, data map[string]interface{}) error {
 
122
                return nil
 
123
        }
119
124
        result, err := s.broker.StartInstance(environs.StartInstanceParams{
120
125
                Constraints:    cons,
121
126
                Tools:          possibleTools,
122
127
                InstanceConfig: instanceConfig,
 
128
                StatusCallback: callback,
123
129
        })
124
130
        c.Assert(err, jc.ErrorIsNil)
125
131
        return result.Instance
136
142
                Version: version.MustParseBinary("2.3.4-quantal-amd64"),
137
143
                URL:     "http://tools.testing.invalid/2.3.4-quantal-amd64.tgz",
138
144
        }}
 
145
        callback := func(settableStatus status.Status, info string, data map[string]interface{}) error {
 
146
                return nil
 
147
        }
139
148
        err = s.broker.MaintainInstance(environs.StartInstanceParams{
140
149
                Constraints:    cons,
141
150
                Tools:          possibleTools,
142
151
                InstanceConfig: instanceConfig,
 
152
                StatusCallback: callback,
143
153
        })
144
154
        c.Assert(err, jc.ErrorIsNil)
145
155
}
253
263
                Version: version.MustParseBinary("2.3.4-quantal-amd64"),
254
264
                URL:     "http://tools.testing.invalid/2.3.4-quantal-amd64.tgz",
255
265
        }}
 
266
        callback := func(settableStatus status.Status, info string, data map[string]interface{}) error {
 
267
                return nil
 
268
        }
256
269
        result, err := s.broker.StartInstance(environs.StartInstanceParams{
257
270
                Constraints:    constraints.Value{},
258
271
                Tools:          possibleTools,
259
272
                InstanceConfig: instanceConfig,
 
273
                StatusCallback: callback,
260
274
        })
261
275
        c.Assert(err, jc.ErrorIsNil)
262
276
        c.Assert(result.NetworkInfo, gc.HasLen, 1)