← Back to branch summary

~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/state/state_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/state/state_test.go
17
17
        "github.com/juju/txn"
18
18
        "github.com/juju/utils"
19
19
        "github.com/juju/utils/arch"
 
20
        "github.com/juju/utils/clock"
20
21
        "github.com/juju/utils/series"
21
22
        "github.com/juju/version"
22
23
        gc "gopkg.in/check.v1"
28
29
        "github.com/juju/juju/agent"
29
30
        "github.com/juju/juju/cloud"
30
31
        "github.com/juju/juju/constraints"
31
 
        "github.com/juju/juju/core/description"
32
32
        "github.com/juju/juju/environs/config"
33
33
        "github.com/juju/juju/instance"
34
34
        "github.com/juju/juju/mongo"
35
35
        "github.com/juju/juju/mongo/mongotest"
36
36
        "github.com/juju/juju/network"
 
37
        "github.com/juju/juju/permission"
37
38
        "github.com/juju/juju/state"
38
39
        "github.com/juju/juju/state/multiwatcher"
39
40
        statetesting "github.com/juju/juju/state/testing"
57
58
func preventUnitDestroyRemove(c *gc.C, u *state.Unit) {
58
59
        now := time.Now()
59
60
        sInfo := status.StatusInfo{
60
 
                Status:  status.StatusIdle,
 
61
                Status:  status.Idle,
61
62
                Message: "",
62
63
                Since:   &now,
63
64
        }
492
493
 
493
494
                                now := time.Now()
494
495
                                sInfo := status.StatusInfo{
495
 
                                        Status:  status.StatusError,
 
496
                                        Status:  status.Error,
496
497
                                        Message: "some status",
497
498
                                        Since:   &now,
498
499
                                }
861
862
        err := s.State.SetModelConstraints(constraints.MustParse("mem=4G"))
862
863
        c.Assert(err, jc.ErrorIsNil)
863
864
        oneJob := []state.MachineJob{state.JobHostUnits}
864
 
        extraCons := constraints.MustParse("cpu-cores=4")
 
865
        extraCons := constraints.MustParse("cores=4")
865
866
        m, err := s.State.AddOneMachine(state.MachineTemplate{
866
867
                Series:      "quantal",
867
868
                Constraints: extraCons,
871
872
        c.Assert(m.Id(), gc.Equals, "0")
872
873
        c.Assert(m.Series(), gc.Equals, "quantal")
873
874
        c.Assert(m.Jobs(), gc.DeepEquals, oneJob)
874
 
        expectedCons := constraints.MustParse("cpu-cores=4 mem=4G")
 
875
        expectedCons := constraints.MustParse("cores=4 mem=4G")
875
876
        mcons, err := m.Constraints()
876
877
        c.Assert(err, jc.ErrorIsNil)
877
878
        c.Assert(mcons, gc.DeepEquals, expectedCons)
1355
1356
        mysql, err := s.State.AddApplication(state.AddApplicationArgs{Name: "mysql", Charm: ch})
1356
1357
        c.Assert(err, jc.ErrorIsNil)
1357
1358
        c.Assert(mysql.Name(), gc.Equals, "mysql")
 
1359
        sInfo, err := mysql.Status()
 
1360
        c.Assert(sInfo.Status, gc.Equals, status.Waiting)
 
1361
        c.Assert(sInfo.Message, gc.Equals, "waiting for machine")
1358
1362
 
1359
1363
        // Check that retrieving the new created services works correctly.
1360
1364
        wordpress, err = s.State.Application("wordpress")
2393
2397
                state.UserAccessSpec{
2394
2398
                        User:      names.NewUserTag("amelia@external"),
2395
2399
                        CreatedBy: s.Owner,
2396
 
                        Access:    description.ReadAccess,
 
2400
                        Access:    permission.ReadAccess,
2397
2401
                })
2398
2402
        c.Assert(err, jc.ErrorIsNil)
2399
2403
 
4031
4035
}
4032
4036
 
4033
4037
func (s *StateSuite) TestNowToTheSecond(c *gc.C) {
4034
 
        t := state.NowToTheSecond()
 
4038
        t := s.State.NowToTheSecond()
4035
4039
        rounded := t.Round(time.Second)
4036
4040
        c.Assert(t, gc.DeepEquals, rounded)
4037
4041
}
4145
4149
        cfg := testing.ModelConfig(c)
4146
4150
        controllerCfg := testing.FakeControllerConfig()
4147
4151
        st, err := state.Initialize(state.InitializeParams{
 
4152
                Clock:            clock.WallClock,
4148
4153
                ControllerConfig: controllerCfg,
4149
4154
                ControllerModelArgs: state.ModelArgs{
4150
4155
                        CloudName:               "dummy",