| Index: cmd/jujud/machine_test.go |
| === modified file 'cmd/jujud/machine_test.go' |
| --- cmd/jujud/machine_test.go 2013-04-09 09:32:06 +0000 |
| +++ cmd/jujud/machine_test.go 2013-04-09 13:25:23 +0000 |
| @@ -20,8 +20,8 @@ |
| var _ = Suite(&MachineSuite{}) |
| -// primeAgent adds a new Machine to run the given jobs, and sets up the |
| -// machine agent's directory. It returns the new machine, the |
| +// primeAgent adds a new Machine to run the given jobs, and sets up |
| +// the machine agent's directory. It returns the new machine, the |
| // agent's configuration and the tools currently running. |
| func (s *MachineSuite) primeAgent(c *C, jobs ...state.MachineJob) (*state.Machine, *agent.Conf, *state.Tools) { |
| m, err := s.State.InjectMachine("series", "ardbeg-0", jobs...) |
| @@ -29,6 +29,9 @@ |
| err = m.SetMongoPassword("machine-password") |
| c.Assert(err, IsNil) |
| conf, tools := s.agentSuite.primeAgent(c, state.MachineTag(m.Id()), "machine-password") |
| + conf.MachineNonce = state.BootstrapNonce |
| + conf.Write() |
| + c.Assert(err, IsNil) |
| return m, conf, tools |
| } |
