Merge lp:~themue/juju-core/go-mstate-relation-test into lp:~juju/juju-core/trunk

[Frank Mueller]

mstate: continued completion of relation_test.go

Added independend relation tests and analyzed the
dependencies for the missing RelationUnitSuite
(see table in Google Apps).

https://codereview.appspot.com/6472060/

[Gustavo Niemeyer (niemeyer)]

LGTM

https://codereview.appspot.com/6472060/

=== modified file 'mstate/relation_test.go'
--- mstate/relation_test.go	2012-08-16 13:29:52 +0000
+++ mstate/relation_test.go	2012-08-27 15:15:36 +0000
@@ -129,6 +129,20 @@
 	c.Assert(err, ErrorMatches, `cannot remove relation "peer:baz": not found`)
 }
 
+func (s *RelationSuite) TestRemoveServiceRemovesRelations(c *C) {
+	peer, err := s.State.AddService("peer", s.charm)
+	c.Assert(err, IsNil)
+	peerep := state.RelationEndpoint{"peer", "ifce", "baz", state.RolePeer, charm.ScopeGlobal}
+	_, err = s.State.AddRelation(peerep)
+	c.Assert(err, IsNil)
+	err = s.State.RemoveService(peer)
+	c.Assert(err, IsNil)
+	_, err = s.State.Service("peer")
+	c.Assert(err, ErrorMatches, `cannot get service "peer": not found`)
+	_, err = s.State.Relation(peerep)
+	c.Assert(err, ErrorMatches, `cannot get relation "peer:baz": not found`)
+}
+
 func (s *RelationSuite) TestLifecycle(c *C) {
 	peer, err := s.State.AddService("peer", s.charm)
 	c.Assert(err, IsNil)

=== modified file 'mstate/state.go'
--- mstate/state.go	2012-08-24 09:43:46 +0000
+++ mstate/state.go	2012-08-27 15:15:36 +0000
@@ -175,14 +175,30 @@
 // its units and break any of its existing relations.
 func (s *State) RemoveService(svc *Service) (err error) {
 	defer trivial.ErrorContextf(&err, "cannot remove service %q", svc)
-
+	// Remove relations first, to minimize unwanted hook executions.
+	// TODO(mue) Will change with full lifecycle integration.
+	rels, err := svc.Relations()
+	if err != nil {
+		return err
+	}
+	for _, rel := range rels {
+		err = rel.Die()
+		if err != nil {
+			return err
+		}
+		err = s.RemoveRelation(rel)
+		if err != nil {
+			return err
+		}
+	}
+	// Remove the service.
 	sel := bson.D{{"_id", svc.doc.Name}, {"life", Alive}}
 	change := bson.D{{"$set", bson.D{{"life", Dying}}}}
 	err = s.services.Update(sel, change)
 	if err != nil {
 		return err
 	}
-
+	// Remove the units.
 	sel = bson.D{{"service", svc.doc.Name}}
 	change = bson.D{{"$set", bson.D{{"life", Dying}}}}
 	_, err = s.units.UpdateAll(sel, change)