Index: state/api/machiner/machiner_test.go |
=== modified file 'state/api/machiner/machiner_test.go' |
--- state/api/machiner/machiner_test.go 2013-07-19 18:01:28 +0000 |
+++ state/api/machiner/machiner_test.go 2013-07-22 12:19:48 +0000 |
@@ -4,16 +4,19 @@ |
package machiner_test |
import ( |
- . "launchpad.net/gocheck" |
+ stdtesting "testing" |
+ |
+ gc "launchpad.net/gocheck" |
+ |
"launchpad.net/juju-core/errors" |
"launchpad.net/juju-core/juju/testing" |
"launchpad.net/juju-core/state" |
"launchpad.net/juju-core/state/api" |
+ "launchpad.net/juju-core/state/api/machiner" |
"launchpad.net/juju-core/state/api/params" |
statetesting "launchpad.net/juju-core/state/testing" |
coretesting "launchpad.net/juju-core/testing" |
"launchpad.net/juju-core/testing/checkers" |
- stdtesting "testing" |
) |
func TestAll(t *stdtesting.T) { |
@@ -24,109 +27,115 @@ |
testing.JujuConnSuite |
st *api.State |
machine *state.Machine |
+ |
+ machiner *machiner.State |
} |
-var _ = Suite(&machinerSuite{}) |
+var _ = gc.Suite(&machinerSuite{}) |
-func (s *machinerSuite) SetUpTest(c *C) { |
+func (s *machinerSuite) SetUpTest(c *gc.C) { |
s.JujuConnSuite.SetUpTest(c) |
// Create a machine so we can log in as its agent. |
var err error |
s.machine, err = s.State.AddMachine("series", state.JobHostUnits) |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
err = s.machine.SetProvisioned("foo", "fake_nonce", nil) |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
err = s.machine.SetPassword("password") |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
s.st = s.OpenAPIAsMachine(c, s.machine.Tag(), "password", "fake_nonce") |
+ |
+ // Create the machiner API facade. |
+ s.machiner = s.st.Machiner() |
+ c.Assert(s.machiner, gc.NotNil) |
} |
-func (s *machinerSuite) TearDownTest(c *C) { |
+func (s *machinerSuite) TearDownTest(c *gc.C) { |
err := s.st.Close() |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
s.JujuConnSuite.TearDownTest(c) |
} |
-func (s *machinerSuite) TestMachineAndMachineId(c *C) { |
- machine, err := s.st.Machiner().Machine("machine-42") |
- c.Assert(err, ErrorMatches, "permission denied") |
- c.Assert(params.ErrCode(err), Equals, params.CodeUnauthorized) |
- c.Assert(machine, IsNil) |
+func (s *machinerSuite) TestMachineAndMachineId(c *gc.C) { |
+ machine, err := s.machiner.Machine("machine-42") |
+ c.Assert(err, gc.ErrorMatches, "permission denied") |
+ c.Assert(params.ErrCode(err), gc.Equals, params.CodeUnauthorized) |
+ c.Assert(machine, gc.IsNil) |
- machine, err = s.st.Machiner().Machine("machine-0") |
- c.Assert(err, IsNil) |
- c.Assert(machine.Tag(), Equals, "machine-0") |
+ machine, err = s.machiner.Machine("machine-0") |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(machine.Tag(), gc.Equals, "machine-0") |
} |
-func (s *machinerSuite) TestSetStatus(c *C) { |
- machine, err := s.st.Machiner().Machine("machine-0") |
- c.Assert(err, IsNil) |
+func (s *machinerSuite) TestSetStatus(c *gc.C) { |
+ machine, err := s.machiner.Machine("machine-0") |
+ c.Assert(err, gc.IsNil) |
status, info, err := s.machine.Status() |
- c.Assert(err, IsNil) |
- c.Assert(status, Equals, params.StatusPending) |
- c.Assert(info, Equals, "") |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(status, gc.Equals, params.StatusPending) |
+ c.Assert(info, gc.Equals, "") |
err = machine.SetStatus(params.StatusStarted, "blah") |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
status, info, err = s.machine.Status() |
- c.Assert(err, IsNil) |
- c.Assert(status, Equals, params.StatusStarted) |
- c.Assert(info, Equals, "blah") |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(status, gc.Equals, params.StatusStarted) |
+ c.Assert(info, gc.Equals, "blah") |
} |
-func (s *machinerSuite) TestEnsureDead(c *C) { |
- c.Assert(s.machine.Life(), Equals, state.Alive) |
- |
- machine, err := s.st.Machiner().Machine("machine-0") |
- c.Assert(err, IsNil) |
- |
- err = machine.EnsureDead() |
- c.Assert(err, IsNil) |
- |
- err = s.machine.Refresh() |
- c.Assert(err, IsNil) |
- c.Assert(s.machine.Life(), Equals, state.Dead) |
- |
- err = machine.EnsureDead() |
- c.Assert(err, IsNil) |
- err = s.machine.Refresh() |
- c.Assert(err, IsNil) |
- c.Assert(s.machine.Life(), Equals, state.Dead) |
+func (s *machinerSuite) TestEnsureDead(c *gc.C) { |
+ c.Assert(s.machine.Life(), gc.Equals, state.Alive) |
+ |
+ machine, err := s.machiner.Machine("machine-0") |
+ c.Assert(err, gc.IsNil) |
+ |
+ err = machine.EnsureDead() |
+ c.Assert(err, gc.IsNil) |
+ |
+ err = s.machine.Refresh() |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(s.machine.Life(), gc.Equals, state.Dead) |
+ |
+ err = machine.EnsureDead() |
+ c.Assert(err, gc.IsNil) |
+ err = s.machine.Refresh() |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(s.machine.Life(), gc.Equals, state.Dead) |
err = s.machine.Remove() |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
err = s.machine.Refresh() |
c.Assert(err, checkers.Satisfies, errors.IsNotFoundError) |
err = machine.EnsureDead() |
- c.Assert(err, ErrorMatches, "machine 0 not found") |
- c.Assert(params.ErrCode(err), Equals, params.CodeNotFound) |
+ c.Assert(err, gc.ErrorMatches, "machine 0 not found") |
+ c.Assert(params.ErrCode(err), gc.Equals, params.CodeNotFound) |
} |
-func (s *machinerSuite) TestRefresh(c *C) { |
- machine, err := s.st.Machiner().Machine("machine-0") |
- c.Assert(err, IsNil) |
- c.Assert(machine.Life(), Equals, params.Alive) |
+func (s *machinerSuite) TestRefresh(c *gc.C) { |
+ machine, err := s.machiner.Machine("machine-0") |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(machine.Life(), gc.Equals, params.Alive) |
err = machine.EnsureDead() |
- c.Assert(err, IsNil) |
- c.Assert(machine.Life(), Equals, params.Alive) |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(machine.Life(), gc.Equals, params.Alive) |
err = machine.Refresh() |
- c.Assert(err, IsNil) |
- c.Assert(machine.Life(), Equals, params.Dead) |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(machine.Life(), gc.Equals, params.Dead) |
} |
-func (s *machinerSuite) TestWatch(c *C) { |
- machine, err := s.st.Machiner().Machine("machine-0") |
- c.Assert(err, IsNil) |
- c.Assert(machine.Life(), Equals, params.Alive) |
+func (s *machinerSuite) TestWatch(c *gc.C) { |
+ machine, err := s.machiner.Machine("machine-0") |
+ c.Assert(err, gc.IsNil) |
+ c.Assert(machine.Life(), gc.Equals, params.Alive) |
w, err := machine.Watch() |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
defer statetesting.AssertStop(c, w) |
wc := statetesting.NewNotifyWatcherC(c, s.BackingState, w) |
@@ -136,12 +145,12 @@ |
// Change something other than the lifecycle and make sure it's |
// not detected. |
err = machine.SetStatus(params.StatusStarted, "not really") |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
wc.AssertNoChange() |
// Make the machine dead and check it's detected. |
err = machine.EnsureDead() |
- c.Assert(err, IsNil) |
+ c.Assert(err, gc.IsNil) |
wc.AssertOneChange() |
statetesting.AssertStop(c, w) |