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

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/worker/provisioner/lxc-broker_test.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-02-03 09:22:46 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20140203092246-e03vg402vztzo4qa
Tags: 1.17.2-0ubuntu1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
184
184
 
185
185
        // The lxc provisioner actually needs the machine it is being created on
186
186
        // to be in state, in order to get the watcher.
187
 
        m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageState)
 
187
        m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageEnviron)
188
188
        c.Assert(err, gc.IsNil)
189
189
        err = m.SetAddresses([]instance.Address{
190
190
                instance.NewAddress("0.1.2.3"),
282
282
type fakeAPI struct{}
283
283
 
284
284
func (*fakeAPI) ContainerConfig() (params.ContainerConfig, error) {
285
 
        return params.ContainerConfig{"fake", "my-keys", true, 2345}, nil
 
285
        return params.ContainerConfig{"fake", coretesting.FakeAuthKeys, true, 2345}, nil
286
286
}