| Index: state/state_test.go |
| === modified file 'state/state_test.go' |
| --- state/state_test.go 2012-09-21 18:26:46 +0000 |
| +++ state/state_test.go 2012-09-21 20:31:39 +0000 |
| @@ -74,7 +74,7 @@ |
| c.Assert(err, IsNil) |
| err = s.State.RemoveMachine(machine.Id()) |
| c.Assert(err, ErrorMatches, "cannot remove machine 0: machine is not dead") |
| - err = machine.Die() |
| + err = machine.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.State.RemoveMachine(machine.Id()) |
| c.Assert(err, IsNil) |
| @@ -107,7 +107,7 @@ |
| c.Assert(err, IsNil) |
| err = m.SetAgentTools(newTools("7.8.9-foo-bar", "http://arble.tgz")) |
| c.Assert(err, IsNil) |
| - err = m.Kill() |
| + err = m.EnsureDying() |
| c.Assert(err, IsNil) |
| } |
| s.AssertMachineCount(c, numInserts) |
| @@ -161,7 +161,7 @@ |
| // Remove of existing service. |
| err = s.State.RemoveService(service) |
| c.Assert(err, ErrorMatches, `cannot remove service "wordpress": service is not dead`) |
| - err = service.Die() |
| + err = service.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.State.RemoveService(service) |
| c.Assert(err, IsNil) |
| @@ -266,7 +266,7 @@ |
| test: func(c *C, s *state.State) { |
| m3, err := s.Machine(3) |
| c.Assert(err, IsNil) |
| - err = m3.Die() |
| + err = m3.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveMachine(3) |
| c.Assert(err, IsNil) |
| @@ -277,13 +277,13 @@ |
| test: func(c *C, s *state.State) { |
| m0, err := s.Machine(0) |
| c.Assert(err, IsNil) |
| - err = m0.Die() |
| + err = m0.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveMachine(0) |
| c.Assert(err, IsNil) |
| m2, err := s.Machine(2) |
| c.Assert(err, IsNil) |
| - err = m2.Die() |
| + err = m2.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveMachine(2) |
| c.Assert(err, IsNil) |
| @@ -296,7 +296,7 @@ |
| c.Assert(err, IsNil) |
| m1, err := s.Machine(1) |
| c.Assert(err, IsNil) |
| - err = m1.Die() |
| + err = m1.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveMachine(1) |
| c.Assert(err, IsNil) |
| @@ -317,7 +317,7 @@ |
| c.Assert(err, IsNil) |
| } |
| for i := 10; i < len(machines); i++ { |
| - err = machines[i].Die() |
| + err = machines[i].EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveMachine(i + 5) |
| c.Assert(err, IsNil) |
| @@ -331,7 +331,7 @@ |
| c.Assert(err, IsNil) |
| m9, err := s.Machine(9) |
| c.Assert(err, IsNil) |
| - err = m9.Die() |
| + err = m9.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveMachine(9) |
| c.Assert(err, IsNil) |
| @@ -446,7 +446,7 @@ |
| test: func(c *C, s *state.State, _ *state.Charm) { |
| svc3, err := s.Service("s3") |
| c.Assert(err, IsNil) |
| - err = svc3.Die() |
| + err = svc3.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveService(svc3) |
| c.Assert(err, IsNil) |
| @@ -457,13 +457,13 @@ |
| test: func(c *C, s *state.State, _ *state.Charm) { |
| svc0, err := s.Service("s0") |
| c.Assert(err, IsNil) |
| - err = svc0.Die() |
| + err = svc0.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveService(svc0) |
| c.Assert(err, IsNil) |
| svc2, err := s.Service("s2") |
| c.Assert(err, IsNil) |
| - err = svc2.Die() |
| + err = svc2.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveService(svc2) |
| c.Assert(err, IsNil) |
| @@ -476,7 +476,7 @@ |
| c.Assert(err, IsNil) |
| svc1, err := s.Service("s1") |
| c.Assert(err, IsNil) |
| - err = svc1.Die() |
| + err = svc1.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveService(svc1) |
| c.Assert(err, IsNil) |
| @@ -493,7 +493,7 @@ |
| c.Assert(err, IsNil) |
| } |
| for i := 10; i < len(services); i++ { |
| - err = services[i].Die() |
| + err = services[i].EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveService(services[i]) |
| c.Assert(err, IsNil) |
| @@ -507,7 +507,7 @@ |
| c.Assert(err, IsNil) |
| svc9, err := s.Service("ss9") |
| c.Assert(err, IsNil) |
| - err = svc9.Die() |
| + err = svc9.EnsureDead() |
| c.Assert(err, IsNil) |
| err = s.RemoveService(svc9) |
| c.Assert(err, IsNil) |
