← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to worker/deployer/deployer_test.go

  • Committer: Dimiter Naydenov
  • Date: 2013-07-29 15:15:41 UTC
  • mto: This revision was merged to the branch mainline in revision 1565.
  • Revision ID: dimiter.naydenov@canonical.com-20130729151541-zm8murwo9u7mtsdu
names: new package

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/deployer/deployer_test.go
13
13
 
14
14
        "launchpad.net/juju-core/errors"
15
15
        jujutesting "launchpad.net/juju-core/juju/testing"
 
16
        "launchpad.net/juju-core/names"
16
17
        "launchpad.net/juju-core/state"
17
18
        "launchpad.net/juju-core/state/api"
18
19
        apideployer "launchpad.net/juju-core/state/api/deployer"
182
183
        ctx := s.getContext(c)
183
184
        machineId, err := u.AssignedMachineId()
184
185
        c.Assert(err, IsNil)
185
 
        dep := deployer.NewDeployer(s.deployerState, ctx, state.MachineTag(machineId))
 
186
        dep := deployer.NewDeployer(s.deployerState, ctx, names.MachineTag(machineId))
186
187
        defer stop(c, dep)
187
188
 
188
189
        // Add a subordinate, and wait for it to be deployed.
235
236
        ctx := s.getContext(c)
236
237
        machineId, err := u.AssignedMachineId()
237
238
        c.Assert(err, IsNil)
238
 
        dep := deployer.NewDeployer(s.deployerState, ctx, state.MachineTag(machineId))
 
239
        dep := deployer.NewDeployer(s.deployerState, ctx, names.MachineTag(machineId))
239
240
        defer stop(c, dep)
240
241
        s.waitFor(c, isRemoved(s.State, sub0.Name()))
241
242
        s.waitFor(c, isRemoved(s.State, sub1.Name()))