← Back to branch summary

~dstroppa/juju-core/joyent-provider-storage

« back to all changes in this revision

Viewing changes to state/unit_test.go

  • Committer: Daniele Stroppa
  • Date: 2014-01-08 15:58:10 UTC
  • mfrom: (1953.1.231 juju-core)
  • Revision ID: daniele.stroppa@joyent.com-20140108155810-xecbwrqkb5i0fyoe
Merging trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/unit_test.go
31
31
        s.ConnSuite.SetUpTest(c)
32
32
        s.charm = s.AddTestingCharm(c, "wordpress")
33
33
        var err error
34
 
        s.service, err = s.State.AddService("wordpress", s.charm)
 
34
        s.service = s.AddTestingService(c, "wordpress", s.charm)
35
35
        c.Assert(err, gc.IsNil)
36
36
        s.unit, err = s.service.AddUnit()
37
37
        c.Assert(err, gc.IsNil)
518
518
 
519
519
func (s *UnitSuite) TestCannotShortCircuitDestroyWithSubordinates(c *gc.C) {
520
520
        // A unit with subordinates is just set to Dying.
521
 
        _, err := s.State.AddService("logging", s.AddTestingCharm(c, "logging"))
522
 
        c.Assert(err, gc.IsNil)
 
521
        s.AddTestingService(c, "logging", s.AddTestingCharm(c, "logging"))
523
522
        eps, err := s.State.InferEndpoints([]string{"logging", "wordpress"})
524
523
        c.Assert(err, gc.IsNil)
525
524
        rel, err := s.State.AddRelation(eps...)
621
620
        // Make a second unit to use later. (Subordinate units can only be created
622
621
        // as a side-effect of a principal entering relation scope.)
623
622
        subCharm := s.AddTestingCharm(c, "logging")
624
 
        _, err := s.State.AddService("logging", subCharm)
625
 
        c.Assert(err, gc.IsNil)
 
623
        s.AddTestingService(c, "logging", subCharm)
626
624
        eps, err := s.State.InferEndpoints([]string{"wordpress", "logging"})
627
625
        c.Assert(err, gc.IsNil)
628
626
        rel, err := s.State.AddRelation(eps...)
890
888
                // principal entering scope; and a given principal can only have a
891
889
                // single subordinate unit of each service.
892
890
                name := "logging" + strconv.Itoa(i)
893
 
                _, err := s.State.AddService(name, subCharm)
894
 
                c.Assert(err, gc.IsNil)
 
891
                s.AddTestingService(c, name, subCharm)
895
892
                eps, err := s.State.InferEndpoints([]string{name, "wordpress"})
896
893
                c.Assert(err, gc.IsNil)
897
894
                rel, err := s.State.AddRelation(eps...)
929
926
        // Create a new unit and add a subordinate.
930
927
        u, err = s.service.AddUnit()
931
928
        c.Assert(err, gc.IsNil)
932
 
        _, err = s.State.AddService("logging", s.AddTestingCharm(c, "logging"))
 
929
        s.AddTestingService(c, "logging", s.AddTestingCharm(c, "logging"))
933
930
        c.Assert(err, gc.IsNil)
934
931
        eps, err := s.State.InferEndpoints([]string{"logging", "wordpress"})
935
932
        c.Assert(err, gc.IsNil)
967
964
 
968
965
func (s *UnitSuite) TestPrincipalName(c *gc.C) {
969
966
        subCharm := s.AddTestingCharm(c, "logging")
970
 
        _, err := s.State.AddService("logging", subCharm)
971
 
        c.Assert(err, gc.IsNil)
 
967
        s.AddTestingService(c, "logging", subCharm)
972
968
        eps, err := s.State.InferEndpoints([]string{"logging", "wordpress"})
973
969
        c.Assert(err, gc.IsNil)
974
970
        rel, err := s.State.AddRelation(eps...)
1015
1011
        // Add a relation between wordpress and mysql...
1016
1012
        wordpress := s.service
1017
1013
        wordpress0 := s.unit
1018
 
        mysql, err := s.State.AddService("mysql", s.AddTestingCharm(c, "mysql"))
1019
 
        c.Assert(err, gc.IsNil)
 
1014
        mysql := s.AddTestingService(c, "mysql", s.AddTestingCharm(c, "mysql"))
1020
1015
        eps, err := s.State.InferEndpoints([]string{"wordpress", "mysql"})
1021
1016
        c.Assert(err, gc.IsNil)
1022
1017
        rel, err := s.State.AddRelation(eps...)
1063
1058
        // Add a relation between wordpress and mysql...
1064
1059
        wordpress := s.service
1065
1060
        wordpress0 := s.unit
1066
 
        mysql, err := s.State.AddService("mysql", s.AddTestingCharm(c, "mysql"))
1067
 
        c.Assert(err, gc.IsNil)
 
1061
        mysql := s.AddTestingService(c, "mysql", s.AddTestingCharm(c, "mysql"))
1068
1062
        eps, err := s.State.InferEndpoints([]string{"wordpress", "mysql"})
1069
1063
        c.Assert(err, gc.IsNil)
1070
1064
        rel, err := s.State.AddRelation(eps...)
1125
1119
                // principal entering scope; and a given principal can only have a
1126
1120
                // single subordinate unit of each service.
1127
1121
                name := "logging" + strconv.Itoa(i)
1128
 
                subSvc, err := s.State.AddService(name, subCharm)
1129
 
                c.Assert(err, gc.IsNil)
 
1122
                subSvc := s.AddTestingService(c, name, subCharm)
1130
1123
                eps, err := s.State.InferEndpoints([]string{name, "wordpress"})
1131
1124
                c.Assert(err, gc.IsNil)
1132
1125
                rel, err := s.State.AddRelation(eps...)