← Back to branch summary

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

« back to all changes in this revision

Viewing changes to state/apiserver/api_test.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/apiserver/api_test.go
31
31
 
32
32
var _ = Suite(&suite{})
33
33
 
34
 
func init() {
35
 
        apiserver.AuthenticationEnabled = true
36
 
}
37
 
 
38
34
func removeServiceAndUnits(c *C, service *state.Service) {
39
35
        // Destroy all units for the service.
40
36
        units, err := service.AllUnits()
1294
1290
        s.setUpScenario(c)
1295
1291
        u, err := s.State.Unit("wordpress/0")
1296
1292
        c.Assert(err, IsNil)
1297
 
        err = u.SetStatus(params.UnitError, "gaaah")
 
1293
        err = u.SetStatus(params.StatusError, "gaaah")
1298
1294
        c.Assert(err, IsNil)
1299
1295
        // Code under test:
1300
1296
        err = s.APIState.Client().Resolved("wordpress/0", false)
1446
1442
                Entity: &params.MachineInfo{
1447
1443
                        Id:         m.Id(),
1448
1444
                        InstanceId: "i-0",
1449
 
                        Status:     params.MachinePending,
 
1445
                        Status:     params.StatusPending,
1450
1446
                },
1451
1447
        }}) {
1452
1448
                c.Logf("got:")