| Index: state/machine_test.go |
| === modified file 'state/machine_test.go' |
| --- state/machine_test.go 2012-09-26 14:18:25 +0000 |
| +++ state/machine_test.go 2012-09-28 07:21:43 +0000 |
| @@ -18,7 +18,7 @@ |
| func (s *MachineSuite) SetUpTest(c *C) { |
| s.ConnSuite.SetUpTest(c) |
| var err error |
| - s.machine, err = s.State.AddMachine() |
| + s.machine, err = s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| } |
| @@ -70,7 +70,7 @@ |
| } |
| func (s *MachineSuite) TestMachineInstanceId(c *C) { |
| - machine, err := s.State.AddMachine() |
| + machine, err := s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| err = s.machines.Update( |
| D{{"_id", machine.Id()}}, |
| @@ -85,7 +85,7 @@ |
| } |
| func (s *MachineSuite) TestMachineInstanceIdCorrupt(c *C) { |
| - machine, err := s.State.AddMachine() |
| + machine, err := s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| err = s.machines.Update( |
| D{{"_id", machine.Id()}}, |
| @@ -108,7 +108,7 @@ |
| } |
| func (s *MachineSuite) TestMachineInstanceIdBlank(c *C) { |
| - machine, err := s.State.AddMachine() |
| + machine, err := s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| err = s.machines.Update( |
| D{{"_id", machine.Id()}}, |
| @@ -135,7 +135,7 @@ |
| } |
| func (s *MachineSuite) TestMachineRefresh(c *C) { |
| - m0, err := s.State.AddMachine() |
| + m0, err := s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| oldId, _ := m0.InstanceId() |
| @@ -180,9 +180,9 @@ |
| // tells us the right thing. |
| m1 := s.machine |
| - m2, err := s.State.AddMachine() |
| + m2, err := s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| - m3, err := s.State.AddMachine() |
| + m3, err := s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| dummy := s.AddTestingCharm(c, "dummy") |
| @@ -444,7 +444,7 @@ |
| err = bacon1.AssignToMachine(s.machine) |
| c.Assert(err, IsNil) |
| - spammachine, err := s.State.AddMachine() |
| + spammachine, err := s.State.AddMachine(state.MachinerWorker) |
| c.Assert(err, IsNil) |
| svc, err = s.State.AddService("spam", ch) |
| c.Assert(err, IsNil) |
