| Index: state/service_test.go |
| === modified file 'state/service_test.go' |
| --- state/service_test.go 2014-03-25 15:48:47 +0000 |
| +++ state/service_test.go 2014-04-14 12:36:13 +0000 |
| @@ -512,7 +512,7 @@ |
| // Check the peer relations got destroyed as well. |
| for _, rel := range rels { |
| err = rel.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| } |
| @@ -709,7 +709,7 @@ |
| err = s.mysql.Destroy() |
| c.Assert(err, gc.IsNil) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestServiceExposed(c *gc.C) { |
| @@ -903,7 +903,7 @@ |
| c.Assert(err, gc.IsNil) |
| c.Assert(s.mysql.Life(), gc.Equals, state.Dying) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestDestroyStillHasUnits(c *gc.C) { |
| @@ -922,7 +922,7 @@ |
| err = unit.Remove() |
| c.Assert(err, gc.IsNil) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestDestroyOnceHadUnits(c *gc.C) { |
| @@ -937,7 +937,7 @@ |
| c.Assert(err, gc.IsNil) |
| c.Assert(s.mysql.Life(), gc.Equals, state.Dying) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestDestroyStaleNonZeroUnitCount(c *gc.C) { |
| @@ -954,7 +954,7 @@ |
| c.Assert(err, gc.IsNil) |
| c.Assert(s.mysql.Life(), gc.Equals, state.Dying) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestDestroyStaleZeroUnitCount(c *gc.C) { |
| @@ -978,7 +978,7 @@ |
| err = unit.Remove() |
| c.Assert(err, gc.IsNil) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestDestroyWithRemovableRelation(c *gc.C) { |
| @@ -993,9 +993,9 @@ |
| err = wordpress.Destroy() |
| c.Assert(err, gc.IsNil) |
| err = wordpress.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| err = rel.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestDestroyWithReferencedRelation(c *gc.C) { |
| @@ -1042,16 +1042,16 @@ |
| // ...while the second is removed directly. |
| err = rel1.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| // Drop the last reference to the first relation; check the relation and |
| // the service are are both removed. |
| err = ru.LeaveScope() |
| c.Assert(err, gc.IsNil) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| err = rel0.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| } |
| func (s *ServiceSuite) TestDestroyQueuesUnitCleanup(c *gc.C) { |
| @@ -1106,7 +1106,7 @@ |
| err := s.mysql.Destroy() |
| c.Assert(err, gc.IsNil) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| _, err = s.State.Unit("mysql/0") |
| c.Assert(err, gc.ErrorMatches, `unit "mysql/0" not found`) |
| } |
| @@ -1141,7 +1141,7 @@ |
| err = s.mysql.Destroy() |
| c.Assert(err, gc.IsNil) |
| err = s.mysql.Refresh() |
| - c.Assert(err, jc.Satisfies, errors.IsNotFoundError) |
| + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
| // ...but we can check that old constraints do not affect new services |
| // with matching names. |
